diff options
| -rw-r--r-- | arch/arm/kernel/head.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 591c097c89ab..6bd82d25683c 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -85,9 +85,11 @@ ENTRY(stext) | |||
| 85 | mrc p15, 0, r9, c0, c0 @ get processor id | 85 | mrc p15, 0, r9, c0, c0 @ get processor id |
| 86 | bl __lookup_processor_type @ r5=procinfo r9=cpuid | 86 | bl __lookup_processor_type @ r5=procinfo r9=cpuid |
| 87 | movs r10, r5 @ invalid processor (r5=0)? | 87 | movs r10, r5 @ invalid processor (r5=0)? |
| 88 | THUMB( it eq ) @ force fixup-able long branch encoding | ||
| 88 | beq __error_p @ yes, error 'p' | 89 | beq __error_p @ yes, error 'p' |
| 89 | bl __lookup_machine_type @ r5=machinfo | 90 | bl __lookup_machine_type @ r5=machinfo |
| 90 | movs r8, r5 @ invalid machine (r5=0)? | 91 | movs r8, r5 @ invalid machine (r5=0)? |
| 92 | THUMB( it eq ) @ force fixup-able long branch encoding | ||
| 91 | beq __error_a @ yes, error 'a' | 93 | beq __error_a @ yes, error 'a' |
| 92 | bl __vet_atags | 94 | bl __vet_atags |
| 93 | #ifdef CONFIG_SMP_ON_UP | 95 | #ifdef CONFIG_SMP_ON_UP |
| @@ -283,6 +285,7 @@ ENTRY(secondary_startup) | |||
| 283 | bl __lookup_processor_type | 285 | bl __lookup_processor_type |
| 284 | movs r10, r5 @ invalid processor? | 286 | movs r10, r5 @ invalid processor? |
| 285 | moveq r0, #'p' @ yes, error 'p' | 287 | moveq r0, #'p' @ yes, error 'p' |
| 288 | THUMB( it eq ) @ force fixup-able long branch encoding | ||
| 286 | beq __error_p | 289 | beq __error_p |
| 287 | 290 | ||
| 288 | /* | 291 | /* |