summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-mohawk.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-16 09:54:02 +0200
committerArnd Bergmann <arnd@arndb.de>2015-12-01 21:44:25 +0100
commit0f67b876092ae4fabe6ff81a92c785a69edb0022 (patch)
tree814b8da150178510e20d3c9edab853603d83c900 /arch/arm/mm/proc-mohawk.S
parentARM: make xscale iwmmxt code multiplatform aware (diff)
downloadlinux-0f67b876092ae4fabe6ff81a92c785a69edb0022.tar.xz
linux-0f67b876092ae4fabe6ff81a92c785a69edb0022.zip
ARM: mohawk: allow building with MMU disabled
It is in principle possible to build an MMP kernel for the mohawk CPU with the MMU code disabled, except for one simple build error: proc-mohawk.S:345: Error: invalid operands (*UND* and *UND* sections) for `|' proc-mohawk.S:345: Error: invalid operands (*ABS* and *UND* sections) for `|' proc-mohawk.S:345: Error: invalid operands (*UND* and *UND* sections) for `|' proc-mohawk.S:345: Error: invalid operands (*UND* and *UND* sections) for `|' proc-mohawk.S:345: Error: undefined symbol L_PTE_USER used as an immediate value This patch changes the proc-mohawk code to do the same as the other CPUs and not try to actually do anything for the cpu_mohawk_set_pte_ext function, which won't be used anyway. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mm/proc-mohawk.S')
-rw-r--r--arch/arm/mm/proc-mohawk.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index d65edf717bf7..6f07d2ef4ff2 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -342,11 +342,13 @@ ENTRY(cpu_mohawk_switch_mm)
*/
.align 5
ENTRY(cpu_mohawk_set_pte_ext)
+#ifdef CONFIG_MMU
armv3_set_pte_ext
mov r0, r0
mcr p15, 0, r0, c7, c10, 1 @ clean D entry
mcr p15, 0, r0, c7, c10, 4 @ drain WB
ret lr
+#endif
.globl cpu_mohawk_suspend_size
.equ cpu_mohawk_suspend_size, 4 * 6