diff options
author | Vasily Gorbik <gor@linux.ibm.com> | 2022-09-14 16:41:21 +0200 |
---|---|---|
committer | Vasily Gorbik <gor@linux.ibm.com> | 2022-09-14 16:41:21 +0200 |
commit | d61bb30e434db7df2a5f1ad5d773ed3a876dee03 (patch) | |
tree | f8a52103d3ef373c8f5ba2ee4707ff617d94b643 /arch/s390/mm/fault.c | |
parent | edcfc9c71bfd491e36ae93a3ea633fb55678f51f (diff) | |
parent | 8d96bba75a43ba564bf8732e955d9f519d2bbaec (diff) |
Merge branch 'fixes' into features
* fixes:
s390/smp: enforce lowcore protection on CPU restart
s390/boot: fix absolute zero lowcore corruption on boot
s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages
s390: update defconfigs
s390: fix nospec table alignments
s390/mm: remove useless hugepage address alignment
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/mm/fault.c')
-rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 5a351042b1c6..9649d9382e0a 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -420,8 +420,6 @@ retry: if (unlikely(!(vma->vm_flags & access))) goto out_up; - if (is_vm_hugetlb_page(vma)) - address &= HPAGE_MASK; /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo |