diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-02-01 02:35:37 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-09 07:08:25 (GMT) |
| commit | dfd713307adb8747b47cb7bf6c08cb887b857c43 (patch) | |
| tree | beef35b381c14471df002184c492525563800730 | |
| parent | f2e24dd918189b355a2f7eeafede54778d18172d (diff) | |
| download | linux-dfd713307adb8747b47cb7bf6c08cb887b857c43.tar.xz | |
xtensa: fix noMMU build on cores with MMU
commit 4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae upstream.
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.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 88a044a..32cdc2c 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 |