From: Greg Kroah-Hartman Date: Tue, 13 May 2008 16:41:25 +0000 (-0700) Subject: another .25 patch X-Git-Tag: v2.6.25.4~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8b3437676bd060eb2aab8c65e5619eb9f111e64;p=thirdparty%2Fkernel%2Fstable-queue.git another .25 patch --- diff --git a/queue-2.6.25/series b/queue-2.6.25/series index a70af292b02..bc800935d6c 100644 --- a/queue-2.6.25/series +++ b/queue-2.6.25/series @@ -15,3 +15,4 @@ macvlan-fix-memleak-on-device-removal-crash-on-module-removal.patch ipvs-fix-oops-in-backup-for-fwmark-conn-templates.patch dccp-return-einval-on-invalid-feature-length.patch can-fix-can_send-handling-on-dev_queue_xmit-failures.patch +x86-use-defconfigs-from-x86-configs.patch diff --git a/queue-2.6.25/x86-use-defconfigs-from-x86-configs.patch b/queue-2.6.25/x86-use-defconfigs-from-x86-configs.patch new file mode 100644 index 00000000000..c5d029afee8 --- /dev/null +++ b/queue-2.6.25/x86-use-defconfigs-from-x86-configs.patch @@ -0,0 +1,64 @@ +From dsd@gentoo.org Tue May 13 09:39:51 2008 +From: Sam Ravnborg +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 + +commit b9b39bfba5b0de3418305f01cfa7bc55a16004e1 upstream + +x86: use defconfigs from x86/configs/* + +Daniel Drake 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 +Signed-off-by: Sam Ravnborg +Signed-off-by: Ingo Molnar +Signed-off-by: Thomas Gleixner +Signed-off-by: Greg Kroah-Hartman + +--- + 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