diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-02 12:39:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-02 12:39:10 -0800 |
| commit | e4178c75049c581114998a850ecdfa5a2811cde6 (patch) | |
| tree | 30ad09d949e58d32a4c0aa0a70bc1819a26d820d /arch/xtensa | |
| parent | f2557779e1a9cfbf69c99b74da26cc1b2b10e752 (diff) | |
| parent | 4b3e6f2ef3722f1a6a97b6034ed492c1a21fd4ae (diff) | |
| download | linux-e4178c75049c581114998a850ecdfa5a2811cde6.tar.gz linux-e4178c75049c581114998a850ecdfa5a2811cde6.tar.xz | |
Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fix from Max Filippov:
"A for an Xtensa build error introduced in reset code refactoring
series in v4.9:
- fix noMMU build on cores with MMU"
* tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: fix noMMU build on cores with MMU
Diffstat (limited to 'arch/xtensa')
| -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 848e8568fb3c..8fd4be610607 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -419,7 +419,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 |