aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Smelkov <kirr@mns.spb.ru>2006-06-23 05:04:33 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:42:59 -0400
commit30343d6c3d4e3fe961369e7be19935683e808c88 (patch)
tree61efa604ac9f9d27b950dd16790a583e9e3b1fb4
parent224f611c1639cb6c134a934dae7f7b9f0ac3b540 (diff)
[PATCH] x86: compile fix for asm-i386/alternatives.h
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: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-i386/alternative.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h
index e201decea0c9..d79e9ee10fd7 100644
--- a/include/asm-i386/alternative.h
+++ b/include/asm-i386/alternative.h
@@ -3,6 +3,8 @@
3 3
4#ifdef __KERNEL__ 4#ifdef __KERNEL__
5 5
6#include <asm/types.h>
7
6struct alt_instr { 8struct alt_instr {
7 u8 *instr; /* original instruction */ 9 u8 *instr; /* original instruction */
8 u8 *replacement; 10 u8 *replacement;