| From dsd@gentoo.org Tue May 13 09:39:51 2008 |
| From: Sam Ravnborg <sam@ravnborg.org> |
| Date: Sat, 10 May 2008 20:07:32 +0100 |
| Subject: x86: use defconfigs from x86/configs/* |
| To: stable@kernel.org |
| Cc: kernel@gentoo.org, sam@ravnborg.org |
| Message-ID: <4825F274.2020205@gentoo.org> |
| |
| |
| From: Sam Ravnborg <sam@ravnborg.org> |
| |
| commit b9b39bfba5b0de3418305f01cfa7bc55a16004e1 upstream |
| |
| x86: use defconfigs from x86/configs/* |
| |
| Daniel Drake <dsd@gentoo.org> reported: |
| |
| In 2.6.23, if you unpacked a kernel source tarball and then |
| ran "make menuconfig" you'd be presented with this message: |
| # using defaults found in arch/i386/defconfig |
| |
| and the default options would be set. |
| |
| The same thing in 2.6.24 does not give you any "using defaults" message, and |
| the default config options within menuconfig are rather blank (e.g. no PCI |
| support). You can work around this by explicitly running "make defconfig" |
| before menuconfig, but it would be nice to have the behaviour the way it was |
| for 2.6.23 (and the way it still is for other archs). |
| |
| Fixed by adding a x86 specific defconfig list to Kconfig. |
| |
| Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10470 |
| |
| Tested-by: Daniel Drake <dsd@gentoo.org> |
| Signed-off-by: Sam Ravnborg <sam@ravnborg.org> |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/Kconfig | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| --- a/arch/x86/Kconfig |
| +++ b/arch/x86/Kconfig |
| @@ -24,6 +24,18 @@ config X86 |
| select HAVE_KRETPROBES |
| select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
| |
| +config DEFCONFIG_LIST |
| + string |
| + depends on X86_32 |
| + option defconfig_list |
| + default "arch/x86/configs/i386_defconfig" |
| + |
| +config DEFCONFIG_LIST |
| + string |
| + depends on X86_64 |
| + option defconfig_list |
| + default "arch/x86/configs/x86_64_defconfig" |
| + |
| |
| config GENERIC_LOCKBREAK |
| def_bool n |