1 files changed, 20 insertions, 9 deletions

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 98c2d055284b..c05430ac1b44 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -54,15 +54,14 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 
-#include <mach_traps.h>
+#include <asm/mach_traps.h>
 
 #ifdef CONFIG_X86_64
 #include <asm/pgalloc.h>
 #include <asm/proto.h>
-#include <asm/pda.h>
 #else
 #include <asm/processor-flags.h>
-#include <asm/arch_hooks.h>
+#include <asm/setup.h>
 #include <asm/traps.h>
 
 #include "cpu/mcheck/mce.h"
@@ -99,6 +98,12 @@ static inline void preempt_conditional_sti(struct pt_regs *regs)
                 local_irq_enable();
 }
 
+static inline void conditional_cli(struct pt_regs *regs)
+{
+        if (regs->flags & X86_EFLAGS_IF)
+                local_irq_disable();
+}
+
 static inline void preempt_conditional_cli(struct pt_regs *regs)
 {
         if (regs->flags & X86_EFLAGS_IF)
@@ -626,8 +631,10 @@ clear_dr7:
 
 #ifdef CONFIG_X86_32
 debug_vm86:
+        /* reenable preemption: handle_vm86_trap() might sleep */
+        dec_preempt_count();
         handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1);
-        preempt_conditional_cli(regs);
+        conditional_cli(regs);
         return;
 #endif
 
@@ -896,7 +903,7 @@ asmlinkage void math_state_restore(void)
 EXPORT_SYMBOL_GPL(math_state_restore);
 
 #ifndef CONFIG_MATH_EMULATION
-asmlinkage void math_emulate(long arg)
+void math_emulate(struct math_emu_info *info)
 {
         printk(KERN_EMERG
                 "math-emulation not enabled and no coprocessor found.\n");
@@ -907,12 +914,16 @@ asmlinkage void math_emulate(long arg)
 #endif /* CONFIG_MATH_EMULATION */
 
 dotraplinkage void __kprobes
-do_device_not_available(struct pt_regs *regs, long error)
+do_device_not_available(struct pt_regs *regs, long error_code)
 {
 #ifdef CONFIG_X86_32
         if (read_cr0() & X86_CR0_EM) {
+                struct math_emu_info info = { };
+
                 conditional_sti(regs);
-                math_emulate(0);
+
+                info.regs = regs;
+                math_emulate(&info);
         } else {
                 math_state_restore(); /* interrupts still off */
                 conditional_sti(regs);
@@ -931,7 +942,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
         info.si_signo = SIGILL;
         info.si_errno = 0;
         info.si_code = ILL_BADSTK;
-        info.si_addr = 0;
+        info.si_addr = NULL;
         if (notify_die(DIE_TRAP, "iret exception",
                         regs, error_code, 32, SIGILL) == NOTIFY_STOP)
                 return;
@@ -1015,6 +1026,6 @@ void __init trap_init(void)
         cpu_init();
 
 #ifdef CONFIG_X86_32
-        trap_init_hook();
+        x86_quirk_trap_init();
 #endif
 }