From 2988d8dd689f844b76f40df2117e257368096dea Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Dec 2003 05:50:23 -0800 Subject: [PATCH] [PATCH] Merge i386 fix for page fault to x86-64 From: Andi Kleen Merge the i386 fix for the page fault from Linus to x86-64 (I'm not actually sure what it fixes, but if it's good for 32bit it is likely good for 64bit too) --- arch/x86_64/mm/fault.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index ba3227b343607..c74156b0001b5 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c @@ -340,7 +340,8 @@ bad_area_nosemaphore: } tsk->thread.cr2 = address; - tsk->thread.error_code = error_code; + /* Kernel addresses are always protection faults */ + tsk->thread.error_code = error_code | (address >= TASK_SIZE); tsk->thread.trap_no = 14; info.si_signo = SIGSEGV; info.si_errno = 0; -- 2.53.0