From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 20 Feb 2009 22:22:34 +0000 (+0100)
Subject: x86, mm: fault.c, remove #ifdef from do_page_fault()
X-Git-Tag: v2.6.30-rc3~72^2~48^5~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c3731c68668325abddee8665018c74c7156a57be;p=~emulex%2Finfiniband.git

x86, mm: fault.c, remove #ifdef from do_page_fault()

Impact: cleanup

do_page_fault() has this ugly #ifdef in its prototype:

  #ifdef CONFIG_X86_64
  asmlinkage
  #endif
  void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)

Replace it with 'dotraplinkage' which maps to exactly the above
construct: nothing on 32-bit and asmlinkage on 64-bit.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 8fe2dd254df..9c2dc5d7953 100644
--- a/arch/x86/mm/fault.c
+++ b/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;