aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_64.c
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-09-26 08:03:08 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:22:34 -0400
commit3c1326f8a6d8b9815ca88c95441330f96eef7352 (patch)
treed46c9e18d19550668d66dd065e9f187ca9a3ed57 /arch/x86/kernel/traps_64.c
parent69c89b5bf7f253756f3056e84b8603abe1c50f5b (diff)
traps: i386: make do_trap more like x86_64
This patch hardcodes which traps should be forwarded to handle_vm86_trap in do_trap. This allows to remove the vm86 parameter from the i386-version of do_trap, which makes the DO_VM86_ERROR and DO_VM86_ERROR_INFO macros unnecessary. x86_64 part is whitespace only. Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r--arch/x86/kernel/traps_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 7d59559c2dff..1efd1ea64663 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -640,7 +640,7 @@ kernel_trap:
640 return; 640 return;
641} 641}
642 642
643#define DO_ERROR(trapnr, signr, str, name) \ 643#define DO_ERROR(trapnr, signr, str, name) \
644asmlinkage void do_##name(struct pt_regs *regs, long error_code) \ 644asmlinkage void do_##name(struct pt_regs *regs, long error_code) \
645{ \ 645{ \
646 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ 646 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \