diff options
| -rw-r--r-- | arch/arm/vfp/entry.S | 6 | ||||
| -rw-r--r-- | arch/arm/vfp/vfphw.S | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index cc926c985981..323ce1a62bbf 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | @ IRQs disabled. | 22 | @ IRQs disabled. |
| 23 | @ | 23 | @ |
| 24 | ENTRY(do_vfp) | 24 | ENTRY(do_vfp) |
| 25 | #ifdef CONFIG_PREEMPT | 25 | #ifdef CONFIG_PREEMPT_COUNT |
| 26 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 26 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 27 | add r11, r4, #1 @ increment it | 27 | add r11, r4, #1 @ increment it |
| 28 | str r11, [r10, #TI_PREEMPT] | 28 | str r11, [r10, #TI_PREEMPT] |
| @@ -35,7 +35,7 @@ ENTRY(do_vfp) | |||
| 35 | ENDPROC(do_vfp) | 35 | ENDPROC(do_vfp) |
| 36 | 36 | ||
| 37 | ENTRY(vfp_null_entry) | 37 | ENTRY(vfp_null_entry) |
| 38 | #ifdef CONFIG_PREEMPT | 38 | #ifdef CONFIG_PREEMPT_COUNT |
| 39 | get_thread_info r10 | 39 | get_thread_info r10 |
| 40 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 40 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 41 | sub r11, r4, #1 @ decrement it | 41 | sub r11, r4, #1 @ decrement it |
| @@ -53,7 +53,7 @@ ENDPROC(vfp_null_entry) | |||
| 53 | 53 | ||
| 54 | __INIT | 54 | __INIT |
| 55 | ENTRY(vfp_testing_entry) | 55 | ENTRY(vfp_testing_entry) |
| 56 | #ifdef CONFIG_PREEMPT | 56 | #ifdef CONFIG_PREEMPT_COUNT |
| 57 | get_thread_info r10 | 57 | get_thread_info r10 |
| 58 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 58 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 59 | sub r11, r4, #1 @ decrement it | 59 | sub r11, r4, #1 @ decrement it |
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S index ea0349f63586..dd5e56f95f3f 100644 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S | |||
| @@ -168,7 +168,7 @@ vfp_hw_state_valid: | |||
| 168 | @ else it's one 32-bit instruction, so | 168 | @ else it's one 32-bit instruction, so |
| 169 | @ always subtract 4 from the following | 169 | @ always subtract 4 from the following |
| 170 | @ instruction address. | 170 | @ instruction address. |
| 171 | #ifdef CONFIG_PREEMPT | 171 | #ifdef CONFIG_PREEMPT_COUNT |
| 172 | get_thread_info r10 | 172 | get_thread_info r10 |
| 173 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 173 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 174 | sub r11, r4, #1 @ decrement it | 174 | sub r11, r4, #1 @ decrement it |
| @@ -192,7 +192,7 @@ look_for_VFP_exceptions: | |||
| 192 | @ not recognised by VFP | 192 | @ not recognised by VFP |
| 193 | 193 | ||
| 194 | DBGSTR "not VFP" | 194 | DBGSTR "not VFP" |
| 195 | #ifdef CONFIG_PREEMPT | 195 | #ifdef CONFIG_PREEMPT_COUNT |
| 196 | get_thread_info r10 | 196 | get_thread_info r10 |
| 197 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 197 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 198 | sub r11, r4, #1 @ decrement it | 198 | sub r11, r4, #1 @ decrement it |
