Commit f8e0870f authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

i386: remove temporary DO_TRAP macros, expanding the last one used 



Only one use of the DO_TRAP macros remains. Expand that one and
remove the macros now.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b939bde2

arch/x86/kernel/traps_32.c

+15 −51
Original line number Diff line number Diff line
@@ -530,56 +530,6 @@ do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs, 
	return;

}



#define DO_TRAP(trapnr, signr, str, name)				\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\

	trace_hardirqs_fixup();						\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\

	do_trap(trapnr, signr, str, 0, regs, error_code, NULL);		\

}



#define DO_TRAP_INFO(trapnr, signr, str, name, sicode, siaddr, irq)	\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\

	siginfo_t info;							\

	if (irq)							\

		local_irq_enable();					\

	info.si_signo = signr;						\

	info.si_errno = 0;						\

	info.si_code = sicode;						\

	info.si_addr = (void __user *)siaddr;				\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\

	do_trap(trapnr, signr, str, 0, regs, error_code, &info);	\

}



#define DO_VM86_TRAP(trapnr, signr, str, name)				\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\

	do_trap(trapnr, signr, str, 1, regs, error_code, NULL);		\

}



#define DO_VM86_TRAP_INFO(trapnr, signr, str, name, sicode, siaddr)	\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\

	siginfo_t info;							\

	info.si_signo = signr;						\

	info.si_errno = 0;						\

	info.si_code = sicode;						\

	info.si_addr = (void __user *)siaddr;				\

	trace_hardirqs_fixup();						\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\

	do_trap(trapnr, signr, str, 1, regs, error_code, &info);	\

}



#define DO_ERROR(trapnr, signr, str, name)				\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\
@@ -643,7 +593,6 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) 
DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)

DO_ERROR(12, SIGBUS, "stack segment", stack_segment)

DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)

DO_TRAP_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1)



void __kprobes

do_general_protection(struct pt_regs *regs, long error_code)
@@ -1263,6 +1212,21 @@ void __kprobes do_machine_check(struct pt_regs *regs, long error) 
}

#endif



void do_iret_error(struct pt_regs *regs, long error_code)

{

	siginfo_t info;

	local_irq_enable();



	info.si_signo = SIGILL;

	info.si_errno = 0;

	info.si_code = ILL_BADSTK;

	info.si_addr = 0;

	if (notify_die(DIE_TRAP, "iret exception",

			regs, error_code, 32, SIGILL) == NOTIFY_STOP)

		return;

	do_trap(32, SIGILL, "iret exception", 0, regs, error_code, &info);

}



void __init trap_init(void)

{

	int i;