diff options
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 23016f6aa645..9b42b88bfba0 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -448,8 +448,11 @@ __common_mmu_cache_on: | |||
448 | mov r1, #-1 | 448 | mov r1, #-1 |
449 | mcr p15, 0, r3, c2, c0, 0 @ load page table pointer | 449 | mcr p15, 0, r3, c2, c0, 0 @ load page table pointer |
450 | mcr p15, 0, r1, c3, c0, 0 @ load domain access control | 450 | mcr p15, 0, r1, c3, c0, 0 @ load domain access control |
451 | mcr p15, 0, r0, c1, c0, 0 @ load control register | 451 | b 1f |
452 | mov pc, lr | 452 | .align 5 @ cache line aligned |
453 | 1: mcr p15, 0, r0, c1, c0, 0 @ load control register | ||
454 | mrc p15, 0, r0, c1, c0, 0 @ and read it back to | ||
455 | sub pc, lr, r0, lsr #32 @ properly flush pipeline | ||
453 | 456 | ||
454 | /* | 457 | /* |
455 | * All code following this line is relocatable. It is relocated by | 458 | * All code following this line is relocatable. It is relocated by |