Commit 0eb14833 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

x86/traps: Kill DO_ERROR_INFO() 



Now that DO_ERROR_INFO() doesn't differ from DO_ERROR() we can remove
it and use DO_ERROR() instead.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
parent 1c326c4d

arch/x86/kernel/traps.c

+9 −15
Original line number Diff line number Diff line
@@ -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_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_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)

#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 */