diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-17 23:05:50 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-17 23:05:50 -0500 |
| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a (patch) | |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 /arch/arm/boot | |
| parent | c3e00a0eff4c05717915ac7a8e4646db3882aebf (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index c2effc917254..c5d60250d43d 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -659,6 +659,7 @@ __armv7_mmu_cache_on: | |||
| 659 | mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer | 659 | mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer |
| 660 | mcrne p15, 0, r1, c3, c0, 0 @ load domain access control | 660 | mcrne p15, 0, r1, c3, c0, 0 @ load domain access control |
| 661 | #endif | 661 | #endif |
| 662 | mcr p15, 0, r0, c7, c5, 4 @ ISB | ||
| 662 | mcr p15, 0, r0, c1, c0, 0 @ load control register | 663 | mcr p15, 0, r0, c1, c0, 0 @ load control register |
| 663 | mrc p15, 0, r0, c1, c0, 0 @ and read it back | 664 | mrc p15, 0, r0, c1, c0, 0 @ and read it back |
| 664 | mov r0, #0 | 665 | mov r0, #0 |