aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 17:22:34 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-20 18:09:44 -0500
commitc3731c68668325abddee8665018c74c7156a57be (patch)
tree82f8da8e648e9d0aa785180fc09d1bc47f35985e
parent1cc99544dde9e48602979f16b9309fade6e93051 (diff)
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>
-rw-r--r--arch/x86/mm/fault.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 8fe2dd254df0..9c2dc5d79531 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)
972 * and the problem, and then passes it off to one of the appropriate 972 * and the problem, and then passes it off to one of the appropriate
973 * routines. 973 * routines.
974 */ 974 */
975#ifdef CONFIG_X86_64 975dotraplinkage void __kprobes
976asmlinkage 976do_page_fault(struct pt_regs *regs, unsigned long error_code)
977#endif
978void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
979{ 977{
980 struct vm_area_struct *vma; 978 struct vm_area_struct *vma;
981 struct task_struct *tsk; 979 struct task_struct *tsk;