aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-07-15 01:02:27 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-17 13:28:48 -0400
commit2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (patch)
tree3fea316a13da0898212d34017b7c8945d06592a6
parent9354094a95aed456a46b353b1051a7e2fab29045 (diff)
x86: fix asm/e820.h for userspace inclusion
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>
-rw-r--r--include/asm-x86/e820.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 33e793e991d0..06633b01dd5b 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -59,6 +59,7 @@ struct e820map {
59 struct e820entry map[E820_X_MAX]; 59 struct e820entry map[E820_X_MAX];
60}; 60};
61 61
62#ifdef __KERNEL__
62/* see comment in arch/x86/kernel/e820.c */ 63/* see comment in arch/x86/kernel/e820.c */
63extern struct e820map e820; 64extern struct e820map e820;
64extern struct e820map e820_saved; 65extern struct e820map e820_saved;
@@ -115,7 +116,7 @@ extern void setup_memory_map(void);
115extern char *default_machine_specific_memory_setup(void); 116extern char *default_machine_specific_memory_setup(void);
116extern char *machine_specific_memory_setup(void); 117extern char *machine_specific_memory_setup(void);
117extern char *memory_setup(void); 118extern char *memory_setup(void);
118 119#endif /* __KERNEL__ */
119#endif /* __ASSEMBLY__ */ 120#endif /* __ASSEMBLY__ */
120 121
121#define ISA_START_ADDRESS 0xa0000 122#define ISA_START_ADDRESS 0xa0000