aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r--arch/x86/kernel/traps_32.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 3065b3f4192..2eb6ca0ef67 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -501,7 +501,7 @@ static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86,
501} 501}
502 502
503#define DO_ERROR(trapnr, signr, str, name) \ 503#define DO_ERROR(trapnr, signr, str, name) \
504fastcall void do_##name(struct pt_regs * regs, long error_code) \ 504void do_##name(struct pt_regs * regs, long error_code) \
505{ \ 505{ \
506 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ 506 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
507 == NOTIFY_STOP) \ 507 == NOTIFY_STOP) \
@@ -510,7 +510,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \
510} 510}
511 511
512#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \ 512#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \
513fastcall void do_##name(struct pt_regs * regs, long error_code) \ 513void do_##name(struct pt_regs * regs, long error_code) \
514{ \ 514{ \
515 siginfo_t info; \ 515 siginfo_t info; \
516 if (irq) \ 516 if (irq) \
@@ -526,7 +526,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \
526} 526}
527 527
528#define DO_VM86_ERROR(trapnr, signr, str, name) \ 528#define DO_VM86_ERROR(trapnr, signr, str, name) \
529fastcall void do_##name(struct pt_regs * regs, long error_code) \ 529void do_##name(struct pt_regs * regs, long error_code) \
530{ \ 530{ \
531 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ 531 if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
532 == NOTIFY_STOP) \ 532 == NOTIFY_STOP) \
@@ -535,7 +535,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \
535} 535}
536 536
537#define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \ 537#define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
538fastcall void do_##name(struct pt_regs * regs, long error_code) \ 538void do_##name(struct pt_regs * regs, long error_code) \
539{ \ 539{ \
540 siginfo_t info; \ 540 siginfo_t info; \
541 info.si_signo = signr; \ 541 info.si_signo = signr; \
@@ -563,7 +563,7 @@ DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
563DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) 563DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
564DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) 564DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
565 565
566fastcall void __kprobes do_general_protection(struct pt_regs * regs, 566void __kprobes do_general_protection(struct pt_regs * regs,
567 long error_code) 567 long error_code)
568{ 568{
569 int cpu = get_cpu(); 569 int cpu = get_cpu();
@@ -764,7 +764,7 @@ static __kprobes void default_do_nmi(struct pt_regs * regs)
764 764
765static int ignore_nmis; 765static int ignore_nmis;
766 766
767fastcall __kprobes void do_nmi(struct pt_regs * regs, long error_code) 767__kprobes void do_nmi(struct pt_regs * regs, long error_code)
768{ 768{
769 int cpu; 769 int cpu;
770 770
@@ -793,7 +793,7 @@ void restart_nmi(void)
793} 793}
794 794
795#ifdef CONFIG_KPROBES 795#ifdef CONFIG_KPROBES
796fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code) 796void __kprobes do_int3(struct pt_regs *regs, long error_code)
797{ 797{
798 trace_hardirqs_fixup(); 798 trace_hardirqs_fixup();
799 799
@@ -829,7 +829,7 @@ fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
829 * find every occurrence of the TF bit that could be saved away even 829 * find every occurrence of the TF bit that could be saved away even
830 * by user code) 830 * by user code)
831 */ 831 */
832fastcall void __kprobes do_debug(struct pt_regs * regs, long error_code) 832void __kprobes do_debug(struct pt_regs * regs, long error_code)
833{ 833{
834 unsigned int condition; 834 unsigned int condition;
835 struct task_struct *tsk = current; 835 struct task_struct *tsk = current;
@@ -961,7 +961,7 @@ void math_error(void __user *ip)
961 force_sig_info(SIGFPE, &info, task); 961 force_sig_info(SIGFPE, &info, task);
962} 962}
963 963
964fastcall void do_coprocessor_error(struct pt_regs * regs, long error_code) 964void do_coprocessor_error(struct pt_regs * regs, long error_code)
965{ 965{
966 ignore_fpu_irq = 1; 966 ignore_fpu_irq = 1;
967 math_error((void __user *)regs->ip); 967 math_error((void __user *)regs->ip);
@@ -1015,7 +1015,7 @@ static void simd_math_error(void __user *ip)
1015 force_sig_info(SIGFPE, &info, task); 1015 force_sig_info(SIGFPE, &info, task);
1016} 1016}
1017 1017
1018fastcall void do_simd_coprocessor_error(struct pt_regs * regs, 1018void do_simd_coprocessor_error(struct pt_regs * regs,
1019 long error_code) 1019 long error_code)
1020{ 1020{
1021 if (cpu_has_xmm) { 1021 if (cpu_has_xmm) {
@@ -1039,7 +1039,7 @@ fastcall void do_simd_coprocessor_error(struct pt_regs * regs,
1039 } 1039 }
1040} 1040}
1041 1041
1042fastcall void do_spurious_interrupt_bug(struct pt_regs * regs, 1042void do_spurious_interrupt_bug(struct pt_regs * regs,
1043 long error_code) 1043 long error_code)
1044{ 1044{
1045#if 0 1045#if 0
@@ -1048,7 +1048,7 @@ fastcall void do_spurious_interrupt_bug(struct pt_regs * regs,
1048#endif 1048#endif
1049} 1049}
1050 1050
1051fastcall unsigned long patch_espfix_desc(unsigned long uesp, 1051unsigned long patch_espfix_desc(unsigned long uesp,
1052 unsigned long kesp) 1052 unsigned long kesp)
1053{ 1053{
1054 struct desc_struct *gdt = __get_cpu_var(gdt_page).gdt; 1054 struct desc_struct *gdt = __get_cpu_var(gdt_page).gdt;