]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: fix asm/e820.h for userspace inclusion
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 15 Jul 2008 05:02:27 +0000 (15:02 +1000)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 17:28:48 +0000 (19:28 +0200)
asm-x86/e820.h is included from userspace.  'x86: make e820.c to have
common functions' (b79cd8f1268bab57ff85b19d131f7f23deab2dee) broke it:

make -C Documentation/lguest
cc -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include
lguest.c  -lz -o lguest
In file included from ../../include/asm-x86/bootparam.h:8,
                 from lguest.c:45:
../../include/asm/e820.h:66: error: expected ‘)’ before ‘start’
../../include/asm/e820.h:67: error: expected ‘)’ before ‘start’
../../include/asm/e820.h:68: error: expected ‘)’ before ‘start’
../../include/asm/e820.h:72: error: expected ‘=’, ‘,’, ‘;’, ‘asm’
or ‘__attribute__’ before ‘e820_update_range’
...

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/e820.h

index 33e793e991d0caebe8b3fecc8104b0d4246942fd..06633b01dd5b73685d3bcb0698ffe8442fc5f88b 100644 (file)
@@ -59,6 +59,7 @@ struct e820map {
        struct e820entry map[E820_X_MAX];
 };
 
+#ifdef __KERNEL__
 /* see comment in arch/x86/kernel/e820.c */
 extern struct e820map e820;
 extern struct e820map e820_saved;
@@ -115,7 +116,7 @@ extern void setup_memory_map(void);
 extern char *default_machine_specific_memory_setup(void);
 extern char *machine_specific_memory_setup(void);
 extern char *memory_setup(void);
-
+#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
 #define ISA_START_ADDRESS      0xa0000