From 227c20226324b7ac36761cbeb6627da8a09b61f1 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 20 Feb 2009 23:22:34 +0100
Subject: [PATCH] --- yaml --- r: 136936 b: refs/heads/master c:
 c3731c68668325abddee8665018c74c7156a57be h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/mm/fault.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ed1afea6d13a..4960129b57b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cc99544dde9e48602979f16b9309fade6e93051
+refs/heads/master: c3731c68668325abddee8665018c74c7156a57be
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 8fe2dd254df0..9c2dc5d79531 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -972,10 +972,8 @@ static int fault_in_kernel_space(unsigned long address)
  * and the problem, and then passes it off to one of the appropriate
  * routines.
  */
-#ifdef CONFIG_X86_64
-asmlinkage
-#endif
-void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
+dotraplinkage void __kprobes
+do_page_fault(struct pt_regs *regs, unsigned long error_code)
 {
 	struct vm_area_struct *vma;
 	struct task_struct *tsk;