diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-11 15:35:00 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-11 15:35:00 +0100 |
| commit | 42578c82e0f1810a07ebe29cb05e874893243d8c (patch) | |
| tree | e2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/mm/proc-v6.S | |
| parent | 2631182bf93919577730e6a6c4345308db590057 (diff) | |
| parent | 85d6943af50537d3aec58b967ffbd3fec88453e9 (diff) | |
| download | op-kernel-dev-42578c82e0f1810a07ebe29cb05e874893243d8c.zip op-kernel-dev-42578c82e0f1810a07ebe29cb05e874893243d8c.tar.gz | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 087e239..524ddae 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -170,6 +170,9 @@ __v6_setup: #endif /* CONFIG_MMU */ adr r5, v6_crval ldmia r5, {r5, r6} +#ifdef CONFIG_CPU_ENDIAN_BE8 + orr r6, r6, #1 << 25 @ big-endian page tables +#endif mrc p15, 0, r0, c1, c0, 0 @ read control register bic r0, r0, r5 @ clear bits them orr r0, r0, r6 @ set them |
