1 files changed, 9 insertions, 15 deletions

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c9dd74124038..73b3ea32245a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -224,23 +224,17 @@ dotraplinkage void do_##name(struct pt_regs *regs, long error_code)	\
         do_error_trap(regs, error_code, str, trapnr, signr);            \
 }
 
-#define DO_ERROR_INFO(trapnr, signr, str, name)                         \
-dotraplinkage void do_##name(struct pt_regs *regs, long error_code)     \
-{                                                                       \
-        do_error_trap(regs, error_code, str, trapnr, signr);            \
-}
-
-DO_ERROR_INFO(X86_TRAP_DE,     SIGFPE,  "divide error",                 divide_error)
-DO_ERROR     (X86_TRAP_OF,     SIGSEGV, "overflow",                     overflow)
-DO_ERROR     (X86_TRAP_BR,     SIGSEGV, "bounds",                       bounds)
-DO_ERROR_INFO(X86_TRAP_UD,     SIGILL,  "invalid opcode",               invalid_op)
-DO_ERROR     (X86_TRAP_OLD_MF, SIGFPE,  "coprocessor segment overrun",  coprocessor_segment_overrun)
-DO_ERROR     (X86_TRAP_TS,     SIGSEGV, "invalid TSS",                  invalid_TSS)
-DO_ERROR     (X86_TRAP_NP,     SIGBUS,  "segment not present",          segment_not_present)
+DO_ERROR(X86_TRAP_DE,     SIGFPE,  "divide error",              divide_error)
+DO_ERROR(X86_TRAP_OF,     SIGSEGV, "overflow",                  overflow)
+DO_ERROR(X86_TRAP_BR,     SIGSEGV, "bounds",                    bounds)
+DO_ERROR(X86_TRAP_UD,     SIGILL,  "invalid opcode",            invalid_op)
+DO_ERROR(X86_TRAP_OLD_MF, SIGFPE,  "coprocessor segment overrun",coprocessor_segment_overrun)
+DO_ERROR(X86_TRAP_TS,     SIGSEGV, "invalid TSS",               invalid_TSS)
+DO_ERROR(X86_TRAP_NP,     SIGBUS,  "segment not present",       segment_not_present)
 #ifdef CONFIG_X86_32
-DO_ERROR     (X86_TRAP_SS,     SIGBUS,  "stack segment",                stack_segment)
+DO_ERROR(X86_TRAP_SS,     SIGBUS,  "stack segment",             stack_segment)
 #endif
-DO_ERROR_INFO(X86_TRAP_AC,     SIGBUS,  "alignment check",              alignment_check)
+DO_ERROR(X86_TRAP_AC,     SIGBUS,  "alignment check",           alignment_check)
 
 #ifdef CONFIG_X86_64
 /* Runs on IST stack */