From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 7 Feb 2008 06:05:42 +0000 (-0800)
Subject: another .24 patch
X-Git-Tag: v2.6.22.19~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa577fdb1863b5cd28d19405e74d656b41f69883;p=thirdparty%2Fkernel%2Fstable-queue.git

another .24 patch
---

diff --git a/queue-2.6.24/series b/queue-2.6.24/series
index 634d4e1cb3b..bde8a3292db 100644
--- a/queue-2.6.24/series
+++ b/queue-2.6.24/series
@@ -25,3 +25,4 @@ lockdep-annotate-epoll.patch
 sys_remap_file_pages-fix-vm_file-accounting.patch
 pci-fix-fakephp-deadlock.patch
 acpi-update-acpi-blacklist.patch
+x86-restore-correct-module-name-for-apm.patch
diff --git a/queue-2.6.24/x86-restore-correct-module-name-for-apm.patch b/queue-2.6.24/x86-restore-correct-module-name-for-apm.patch
new file mode 100644
index 00000000000..57dace1effc
--- /dev/null
+++ b/queue-2.6.24/x86-restore-correct-module-name-for-apm.patch
@@ -0,0 +1,44 @@
+From stable-bounces@linux.kernel.org Sun Feb  3 04:20:14 2008
+From: Sam Ravnborg <sam@ravnborg.org>
+Date: Sun, 3 Feb 2008 13:19:38 +0100
+Subject: x86: restore correct module name for apm
+To: Greg Kroah-Hartman <gregkh@suse.de>, Chris Wright <chrisw@sous-sol.org>
+Cc: stable@kernel.org
+Message-ID: <20080203121938.GA15811@elte.hu>
+Content-Disposition: inline
+
+From: Sam Ravnborg <sam@ravnborg.org>
+
+patch 3a900d89db35c133bc0874e71d9156b22db362b4 in mainline
+
+The apm module were renamed to apm_32 during the merge of 32 and 64 bit
+x86 which is unfortunate. As apm is 32 bit specific we like to keep the
+_32 in the filename but the module should be named apm.
+
+Fix this in the Makefile.
+
+Reported-by: "A.E.Lawrence" <lawrence_a_e@ntlworld.com>
+Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+Cc: Cc: Ingo Molnar <mingo@elte.hu>
+Cc: "H. Peter Anvin" <hpa@zytor.com>
+Cc: "A.E.Lawrence" <lawrence_a_e@ntlworld.com>
+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/kernel/Makefile_32 |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/Makefile_32
++++ b/arch/x86/kernel/Makefile_32
+@@ -19,7 +19,8 @@ obj-$(CONFIG_X86_MSR)		+= msr.o
+ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
+ obj-$(CONFIG_MICROCODE)		+= microcode.o
+ obj-$(CONFIG_PCI)		+= early-quirks.o
+-obj-$(CONFIG_APM)		+= apm_32.o
++apm-y				:= apm_32.o
++obj-$(CONFIG_APM)		+= apm.o
+ obj-$(CONFIG_X86_SMP)		+= smp_32.o smpboot_32.o tsc_sync.o
+ obj-$(CONFIG_SMP)		+= smpcommon_32.o
+ obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_32.o