1 files changed, 6 insertions, 13 deletions

diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index 3e5d3115a2a6..be807625ed8c 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -14,10 +14,13 @@
  * r10 points at the start of the private FP workspace in the thread structure
  * sp points to a struct pt_regs (as defined in include/asm/proc/ptrace.h)
  */
+#include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
 #include <linux/kern_levels.h>
-#include "../kernel/entry-header.S"
+#include <asm/assembler.h>
+#include <asm/asm-offsets.h>
 
         .macro  DBGSTR, str
 #ifdef DEBUG
@@ -179,12 +182,7 @@ vfp_hw_state_valid:
                                         @ else it's one 32-bit instruction, so
                                         @ always subtract 4 from the following
                                         @ instruction address.
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         mov     pc, r9                  @ we think we have handled things
 
 
@@ -203,12 +201,7 @@ look_for_VFP_exceptions:
         @ not recognised by VFP
 
         DBGSTR  "not VFP"
-#ifdef CONFIG_PREEMPT_COUNT
-        get_thread_info r10
-        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
-        sub     r11, r4, #1             @ decrement it
-        str     r11, [r10, #TI_PREEMPT]
-#endif
+        dec_preempt_count_ti r10, r4
         mov     pc, lr
 
 process_exception: