added fix for .27 tree.

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 6de3e7978b37ac37d69afb008ca57bc383121a94..1b6e7f28e449f493d5cb726ae7ccf6cad63998bf 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -3,6 +3,7 @@ x86-add-dmi-quirk-for-ami-bios-which-corrupts-address-0xc000-during-resume.patch
 x86-reserve-low-64k-on-ami-and-phoenix-bios-boxen.patch
 x86-add-x86_reserve_low_64k.patch
 x86-fix-config_x86_reserve_low_64k-y.patch
+x86-fix-macro-with-bad_bios_dmi_table.patch
 cgroups-fix-invalid-cgrp-dentry-before-cgroup-has-been-completely-removed.patch
 hugetlb-pull-gigantic-page-initialisation-out-of-the-default-path.patch
 hugetlbfs-handle-pages-higher-order-than-max_order.patch
@@ -45,4 +46,3 @@ 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-fix-macro-with-bad_bios_dmi_table.patch b/queue-2.6.27/x86-fix-macro-with-bad_bios_dmi_table.patch
new file mode 100644 (file)
index 0000000..b80ad23
--- /dev/null
+++ b/queue-2.6.27/x86-fix-macro-with-bad_bios_dmi_table.patch
@@ -0,0 +1,33 @@
+From a8b71a2810386a5ac8f43d2095fe3355f0d8db37 Mon Sep 17 00:00:00 2001
+From: Yinghai Lu <yhlu.kernel@gmail.com>
+Date: Tue, 23 Sep 2008 00:35:33 -0700
+Subject: x86: fix macro with bad_bios_dmi_table
+
+From: Yinghai Lu <yhlu.kernel@gmail.com>
+
+commit a8b71a2810386a5ac8f43d2095fe3355f0d8db37 upstream.
+
+DMI tables need a blank NULL tail.
+
+fixes the crash on Ingo's test box.
+
+Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/kernel/setup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -607,8 +607,8 @@ static struct dmi_system_id __initdata b
+                       DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
+               },
+       },
+-      {}
+ #endif
++      {}
+ };
+ 
+ /*

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
deleted file mode 100644 (file)
index 416cef4..0000000
--- a/queue-2.6.27/x86-make-numa-on-32-bit-depend-on-broken.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4694516d1987303dd83bfd0efdd36fa5b65d701b Mon Sep 17 00:00:00 2001
-From: Rafael J. Wysocki <rjw@sisk.pl>
-Date: Mon, 10 Nov 2008 21:52:47 +0100
-Subject: x86: Make NUMA on 32-bit depend on BROKEN
-
-From: Rafael J. Wysocki <rjw@sisk.pl>
-
-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 <rjw@sisk.pl>
-Cc: Andi Kleen <andi@firstfloor.org>
-Cc: Pavel Machek <pavel@suse.cz>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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