diff options
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 9be21ba648cd..be97e0832d73 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -174,7 +174,8 @@ not_angel: | |||
| 174 | ldr sp, [r0, #28] | 174 | ldr sp, [r0, #28] |
| 175 | #ifdef CONFIG_AUTO_ZRELADDR | 175 | #ifdef CONFIG_AUTO_ZRELADDR |
| 176 | @ determine final kernel image address | 176 | @ determine final kernel image address |
| 177 | and r4, pc, #0xf8000000 | 177 | mov r4, pc |
| 178 | and r4, r4, #0xf8000000 | ||
| 178 | add r4, r4, #TEXT_OFFSET | 179 | add r4, r4, #TEXT_OFFSET |
| 179 | #else | 180 | #else |
| 180 | ldr r4, =zreladdr | 181 | ldr r4, =zreladdr |
| @@ -445,7 +446,8 @@ __setup_mmu: sub r3, r4, #16384 @ Page directory size | |||
| 445 | */ | 446 | */ |
| 446 | mov r1, #0x1e | 447 | mov r1, #0x1e |
| 447 | orr r1, r1, #3 << 10 | 448 | orr r1, r1, #3 << 10 |
| 448 | mov r2, pc, lsr #20 | 449 | mov r2, pc |
| 450 | mov r2, r2, lsr #20 | ||
| 449 | orr r1, r1, r2, lsl #20 | 451 | orr r1, r1, r2, lsl #20 |
| 450 | add r0, r3, r2, lsl #2 | 452 | add r0, r3, r2, lsl #2 |
| 451 | str r1, [r0], #4 | 453 | str r1, [r0], #4 |
