Commit 73531905ed53576d9e8707659a761e7046a60497
1 parent
9723c046bd
Exists in
master
and in
20 other branches
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
init/Kconfig contains a list of configs that are searched for if 'make *config' are used with no .config present. Extend this list to look at the config identified by ARCH_DEFCONFIG. With this change we now try the defconfig targets last. This fixes a regression reported by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>
Showing 2 changed files with 4 additions and 10 deletions Side-by-side Diff
arch/x86/Kconfig
| ... | ... | @@ -26,17 +26,10 @@ |
| 26 | 26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
| 27 | 27 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
| 28 | 28 | |
| 29 | -config DEFCONFIG_LIST | |
| 29 | +config ARCH_DEFCONFIG | |
| 30 | 30 | string |
| 31 | - depends on X86_32 | |
| 32 | - option defconfig_list | |
| 33 | - default "arch/x86/configs/i386_defconfig" | |
| 34 | - | |
| 35 | -config DEFCONFIG_LIST | |
| 36 | - string | |
| 37 | - depends on X86_64 | |
| 38 | - option defconfig_list | |
| 39 | - default "arch/x86/configs/x86_64_defconfig" | |
| 31 | + default "arch/x86/configs/i386_defconfig" if X86_32 | |
| 32 | + default "arch/x86/configs/x86_64_defconfig" if X86_64 | |
| 40 | 33 | |
| 41 | 34 | |
| 42 | 35 | config GENERIC_LOCKBREAK |
init/Kconfig