Commit b406ac61 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: remove nx_enabled from fault.c

On !PAE 32-bit, _PAGE_NX will be 0, making is_prefetch always
return early.  The test is sufficient on PAE as __supported_pte_mask
is updated in the same places as nx_enabled in init_32.c which also
takes disable_nx into account.
Signed-off-by: default avatarHarvey Harrison <>
Signed-off-by: default avatarIngo Molnar <>
Signed-off-by: default avatarThomas Gleixner <>
parent c61e211d
......@@ -92,18 +92,13 @@ static int is_prefetch(struct pt_regs *regs, unsigned long addr,
unsigned char *max_instr;
#ifdef CONFIG_X86_32
# ifdef CONFIG_X86_PAE
/* If it was a exec fault on NX page, ignore */
if (nx_enabled && (error_code & PF_INSTR))
if (!(__supported_pte_mask & _PAGE_NX))
return 0;
# else
return 0;
# endif
#else /* CONFIG_X86_64 */
/* If it was a exec fault on NX page, ignore */
if (error_code & PF_INSTR)
return 0;
instr = (unsigned char *)convert_ip_to_linear(current, regs);
max_instr = instr + 15;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment