summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2017-01-31 18:35:37 -0800
committerMax Filippov <jcmvbkbc@gmail.com>2017-01-31 18:49:59 -0800
commit4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae (patch)
tree8d7f85ac726d7b702732c8d0921cafc4bb6809cb /arch/xtensa
parent69973b830859bc6529a7a0468ba0d80ee5117826 (diff)
downloadlinux-4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae.tar.gz
linux-4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae.tar.xz
xtensa: fix noMMU build on cores with MMU
Commit bf15f86b343ed8 ("xtensa: initialize MMU before jumping to reset vector") calls MMU management functions even when CONFIG_MMU is not selected. That breaks noMMU build on cores with MMU. Don't manage MMU when CONFIG_MMU is not selected. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 88a044af7504..32cdc2c52e98 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -540,7 +540,7 @@ subsys_initcall(topology_init);
void cpu_reset(void)
{
-#if XCHAL_HAVE_PTP_MMU
+#if XCHAL_HAVE_PTP_MMU && IS_ENABLED(CONFIG_MMU)
local_irq_disable();
/*
* We have full MMU: all autoload ways, ways 7, 8 and 9 of DTLB must