1 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index a5a4e57763c3..83c4e384b16d 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -137,6 +137,12 @@ check_for_exception:
         VFPFMXR FPEXC, r1               @ restore FPEXC last
         sub     r2, r2, #4
         str     r2, [sp, #S_PC]         @ retry the instruction
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         mov     pc, r9                  @ we think we have handled things
 
 
@@ -155,6 +161,12 @@ look_for_VFP_exceptions:
         @ not recognised by VFP
 
         DBGSTR  "not VFP"
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         mov     pc, lr
 
 process_exception: