From: Greg Kroah-Hartman Date: Tue, 11 Nov 2008 22:26:52 +0000 (-0800) Subject: another .27 patch X-Git-Tag: v2.6.27.6~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0695e760184afa4c7744b14e2662b3b619d2577;p=thirdparty%2Fkernel%2Fstable-queue.git another .27 patch --- diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 67b65559f89..6de3e7978b3 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -45,3 +45,4 @@ mmc-increase-sd-write-timeout-for-crappy-cards.patch hfsplus-fix-buffer-overflow-with-a-corrupted-image.patch hfsplus-check-read_mapping_page-return-value.patch hfs-fix-namelength-memory-corruption.patch +x86-make-numa-on-32-bit-depend-on-broken.patch diff --git a/queue-2.6.27/x86-make-numa-on-32-bit-depend-on-broken.patch b/queue-2.6.27/x86-make-numa-on-32-bit-depend-on-broken.patch new file mode 100644 index 00000000000..416cef4592c --- /dev/null +++ b/queue-2.6.27/x86-make-numa-on-32-bit-depend-on-broken.patch @@ -0,0 +1,40 @@ +From 4694516d1987303dd83bfd0efdd36fa5b65d701b Mon Sep 17 00:00:00 2001 +From: Rafael J. Wysocki +Date: Mon, 10 Nov 2008 21:52:47 +0100 +Subject: x86: Make NUMA on 32-bit depend on BROKEN + +From: Rafael J. Wysocki + +commit 4694516d1987303dd83bfd0efdd36fa5b65d701b upstream + +While investigating the failure of hibernation on 32-bit x86 with +CONFIG_NUMA set, as described in this message +http://marc.info/?l=linux-kernel&m=122634118116226&w=4 +I asked some people for help and I was told that it wasn't really +worth the effort, because CONFIG_NUMA was generally broken on 32-bit +x86 systems and it shouldn't be used in such configs. For this +reason, make CONFIG_NUMA depend on BROKEN instead of EXPERIMENTAL on +x86-32. + +Signed-off-by: Rafael J. Wysocki +Cc: Andi Kleen +Cc: Pavel Machek +Cc: Peter Zijlstra +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -936,7 +936,7 @@ config X86_PAE + config NUMA + bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" + depends on SMP +- depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) ++ depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN) + default n if X86_PC + default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) + help