summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2016-07-06 16:06:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-06 16:27:20 -0700
commit076501ff6ba265a473689c112eda9f1f34f620b5 (patch)
treef25666c2afaa40ee74d511398c725f46953d4816 /init
parentbc86765181aa26cc9afcb0a6f9f253cbb1186f26 (diff)
init/Kconfig: keep Expert users menu together
The "expert" menu was broken (split) such that all entries in it after KALLSYMS were displayed in the "General setup" area instead of in the "Expert users" area. Fix this by adding one kconfig dependency. Yes, the Expert users menu is fragile. Problems like this have happened several times in the past. I will attempt to isolate the Expert users menu if there is interest in that. Fixes: 4d5d5664c900 ("x86: kallsyms: disable absolute percpu symbols on !SMP") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: stable@vger.kernel.org # 4.6 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f755a602d4a1..c02d89777713 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1458,6 +1458,7 @@ config KALLSYMS_ALL
config KALLSYMS_ABSOLUTE_PERCPU
bool
+ depends on KALLSYMS
default X86_64 && SMP
config KALLSYMS_BASE_RELATIVE