diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 10:51:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-31 10:51:12 -0700 |
| commit | 97cddfc34549014b902f5954953ebd9a4f3f040a (patch) | |
| tree | 1dd2ce9455986e92942ecd5eb06cd9ade86a1c0d /arch/x86/Kconfig | |
| parent | 9589351ccf47a85a75180a430627c16bc28da929 (diff) | |
| parent | 4caffe6a28d3157c11cae923a40456a053c520ea (diff) | |
| download | lwn-97cddfc34549014b902f5954953ebd9a4f3f040a.tar.gz lwn-97cddfc34549014b902f5954953ebd9a4f3f040a.zip | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build updates from Ingo Molnar:
"A handful of updates: two linker script cleanups and a stock
defconfig+allmodconfig bootability fix"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vdso: Discard .note.gnu.property sections in vDSO
x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
x86/Kconfig: Make CMDLINE_OVERRIDE depend on non-empty CMDLINE
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 47107eebc685..ade80caafe6b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2417,7 +2417,7 @@ config CMDLINE config CMDLINE_OVERRIDE bool "Built-in command line overrides boot loader arguments" - depends on CMDLINE_BOOL + depends on CMDLINE_BOOL && CMDLINE != "" ---help--- Set this option to 'Y' to have the kernel ignore the boot loader command line, and use ONLY the built-in command line. |