X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fs390%2Fmm%2Ffault.c;h=4d537205e83c0013d159a9cd8fc5145e0dd80813;hb=f57e91682d141ea50d8c6d42cdc251b6256a3755;hp=2650f46001d098c5f04cee1ce5b11d7de3eaffb9;hpb=62429f434091586d54b37b8dd46076e7c08b27b9;p=linux-2.6

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 2650f46001..4d537205e8 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -28,6 +28,7 @@
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
+#include <linux/hugetlb.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/s390_ext.h>
@@ -367,6 +368,8 @@ good_area:
 	}
 
 survive:
+	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