diff --git a/[refs] b/[refs] index 809b6306c5f7..d1dbd66ca94f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c178a26d3e753d2a4346d3e4b8aa549d387f698 +refs/heads/master: cd1b68f08f6328737928e5b8ba8ef80394680ff0 diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c index f195691ec26e..413e835e4a80 100644 --- a/trunk/arch/x86/mm/fault.c +++ b/trunk/arch/x86/mm/fault.c @@ -836,11 +836,9 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address) if (!(error_code & PF_USER)) no_context(regs, error_code, address); -#ifdef CONFIG_X86_32 - /* User space => ok to do another page fault: */ + /* User-space => ok to do another page fault: */ if (is_prefetch(regs, error_code, address)) return; -#endif tsk->thread.cr2 = address; tsk->thread.error_code = error_code;