diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 19:02:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 19:02:04 +0100 |
| commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d (patch) | |
| tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 /arch/arm/boot | |
| parent | Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/w... (diff) | |
| parent | ARM: LPAE: Add the Kconfig entries (diff) | |
| download | linux-6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d.tar.xz linux-6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable
Conflicts:
arch/arm/mm/ioremap.c
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: mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer mcrne p15, 0, r1, c3, c0, 0 @ load domain access control #endif + mcr p15, 0, r0, c7, c5, 4 @ ISB mcr p15, 0, r0, c1, c0, 0 @ load control register mrc p15, 0, r0, c1, c0, 0 @ and read it back mov r0, #0 |