2 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index fdc667422df9..c0c82bc143c9 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -92,7 +92,8 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
         unsigned char *max_instr;
 
 #ifdef CONFIG_X86_32
-        if (!(__supported_pte_mask & _PAGE_NX))
+        /* Catch an obscure case of prefetch inside an NX page: */
+        if ((__supported_pte_mask & _PAGE_NX) && (error_code & 16))
                 return 0;
 #endif
 
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 4fbafb4bc2f0..0b3d567e686d 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -178,7 +178,7 @@ follow_huge_addr(struct mm_struct *mm, unsigned long address, int write)
 
         page = &pte_page(*pte)[vpfn % (HPAGE_SIZE/PAGE_SIZE)];
 
-        WARN_ON(!PageCompound(page));
+        WARN_ON(!PageHead(page));
 
         return page;
 }