1 files changed, 17 insertions, 17 deletions

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 8c8093b146ca..b857ed890b4c 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -88,7 +88,7 @@ static inline void conditional_sti(struct pt_regs *regs)
 
 static inline void preempt_conditional_sti(struct pt_regs *regs)
 {
-        inc_preempt_count();
+        preempt_count_inc();
         if (regs->flags & X86_EFLAGS_IF)
                 local_irq_enable();
 }
@@ -103,7 +103,7 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
 {
         if (regs->flags & X86_EFLAGS_IF)
                 local_irq_disable();
-        dec_preempt_count();
+        preempt_count_dec();
 }
 
 static int __kprobes
@@ -653,7 +653,7 @@ void math_state_restore(void)
                 return;
         }
 
-        tsk->fpu_counter++;
+        tsk->thread.fpu_counter++;
 }
 EXPORT_SYMBOL_GPL(math_state_restore);
 
@@ -713,7 +713,7 @@ void __init early_trap_init(void)
         /* int3 can be called from all */
         set_system_intr_gate_ist(X86_TRAP_BP, &int3, DEBUG_STACK);
 #ifdef CONFIG_X86_32
-        set_intr_gate(X86_TRAP_PF, &page_fault);
+        set_intr_gate(X86_TRAP_PF, page_fault);
 #endif
         load_idt(&idt_descr);
 }
@@ -721,7 +721,7 @@ void __init early_trap_init(void)
 void __init early_trap_pf_init(void)
 {
 #ifdef CONFIG_X86_64
-        set_intr_gate(X86_TRAP_PF, &page_fault);
+        set_intr_gate(X86_TRAP_PF, page_fault);
 #endif
 }
 
@@ -737,30 +737,30 @@ void __init trap_init(void)
         early_iounmap(p, 4);
 #endif
 
-        set_intr_gate(X86_TRAP_DE, &divide_error);
+        set_intr_gate(X86_TRAP_DE, divide_error);
         set_intr_gate_ist(X86_TRAP_NMI, &nmi, NMI_STACK);
         /* int4 can be called from all */
         set_system_intr_gate(X86_TRAP_OF, &overflow);
-        set_intr_gate(X86_TRAP_BR, &bounds);
-        set_intr_gate(X86_TRAP_UD, &invalid_op);
-        set_intr_gate(X86_TRAP_NM, &device_not_available);
+        set_intr_gate(X86_TRAP_BR, bounds);
+        set_intr_gate(X86_TRAP_UD, invalid_op);
+        set_intr_gate(X86_TRAP_NM, device_not_available);
 #ifdef CONFIG_X86_32
         set_task_gate(X86_TRAP_DF, GDT_ENTRY_DOUBLEFAULT_TSS);
 #else
         set_intr_gate_ist(X86_TRAP_DF, &double_fault, DOUBLEFAULT_STACK);
 #endif
-        set_intr_gate(X86_TRAP_OLD_MF, &coprocessor_segment_overrun);
-        set_intr_gate(X86_TRAP_TS, &invalid_TSS);
-        set_intr_gate(X86_TRAP_NP, &segment_not_present);
+        set_intr_gate(X86_TRAP_OLD_MF, coprocessor_segment_overrun);
+        set_intr_gate(X86_TRAP_TS, invalid_TSS);
+        set_intr_gate(X86_TRAP_NP, segment_not_present);
         set_intr_gate_ist(X86_TRAP_SS, &stack_segment, STACKFAULT_STACK);
-        set_intr_gate(X86_TRAP_GP, &general_protection);
-        set_intr_gate(X86_TRAP_SPURIOUS, &spurious_interrupt_bug);
-        set_intr_gate(X86_TRAP_MF, &coprocessor_error);
-        set_intr_gate(X86_TRAP_AC, &alignment_check);
+        set_intr_gate(X86_TRAP_GP, general_protection);
+        set_intr_gate(X86_TRAP_SPURIOUS, spurious_interrupt_bug);
+        set_intr_gate(X86_TRAP_MF, coprocessor_error);
+        set_intr_gate(X86_TRAP_AC, alignment_check);
 #ifdef CONFIG_X86_MCE
         set_intr_gate_ist(X86_TRAP_MC, &machine_check, MCE_STACK);
 #endif
-        set_intr_gate(X86_TRAP_XF, &simd_coprocessor_error);
+        set_intr_gate(X86_TRAP_XF, simd_coprocessor_error);
 
         /* Reserve all the builtin and the syscall vector: */
         for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)