summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 10:38:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 10:38:59 -0700
commit2b04be7e8ab5756ea36e137dd03c8773d184e67e (patch)
treec08e68a41b055bf9d7823ffd6f8843b72098f020 /include
parentbdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (diff)
parent2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (diff)
downloadop-kernel-dev-2b04be7e8ab5756ea36e137dd03c8773d184e67e.zip
op-kernel-dev-2b04be7e8ab5756ea36e137dd03c8773d184e67e.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix asm/e820.h for userspace inclusion x86: fix numaq_tsc_disable x86: fix kernel_physical_mapping_init() for large x86 systems
Diffstat (limited to 'include')
-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 33e793e..06633b0 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -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
OpenPOWER on IntegriCloud