From: Chris Wright <chrisw@sous-sol.org>
Date: Tue, 20 Jun 2006 08:37:43 +0000 (-0700)
Subject: i386 alternatives compile fix, fwd from akpm
X-Git-Tag: v2.6.16.21~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1175a0b02078aa7c0145b141d0811ef1107c5b2e;p=thirdparty%2Fkernel%2Fstable-queue.git

i386 alternatives compile fix, fwd from akpm
---

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index c96386b452e..c7a2e5f784d 100644
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -10,3 +10,4 @@ sctp-fix-persistent-slowdown-in-sctp-when-a-gap-ack-consumes-rx-buffer.patch
 ethtool-fix-ufo-typo.patch
 sparc32-fix-iommu_flush_iotlb-end-address.patch
 ntfs-critical-bug-fix.patch
+x86-compile-fix-for-asm-i386-alternatives.h.patch
diff --git a/queue-2.6.17/x86-compile-fix-for-asm-i386-alternatives.h.patch b/queue-2.6.17/x86-compile-fix-for-asm-i386-alternatives.h.patch
new file mode 100644
index 00000000000..d94809e576d
--- /dev/null
+++ b/queue-2.6.17/x86-compile-fix-for-asm-i386-alternatives.h.patch
@@ -0,0 +1,35 @@
+From stable-bounces@linux.kernel.org  Tue Jun 20 00:32:35 2006
+Date: Tue, 20 Jun 2006 00:32:01 -0700
+From: akpm@osdl.org
+To: kirr@mns.spb.ru, stable@kernel.org
+Cc: 
+Subject: x86: compile fix for asm-i386/alternatives.h
+
+From: Kirill Smelkov <kirr@mns.spb.ru>
+
+compile fix:  <asm-i386/alternative.h>  needs  <asm/types.h> for 'u8' --
+just look at struct alt_instr.
+
+My module includes <asm/bitops.h> as the first header, and as of 2.6.17 this
+leads to compilation errors.
+
+Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ include/asm-i386/alternative.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- linux-2.6.17.1.orig/include/asm-i386/alternative.h
++++ linux-2.6.17.1/include/asm-i386/alternative.h
+@@ -3,6 +3,8 @@
+ 
+ #ifdef __KERNEL__
+ 
++#include <asm/types.h>
++
+ struct alt_instr {
+ 	u8 *instr; 		/* original instruction */
+ 	u8 *replacement;