diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:38:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:38:59 -0400 |
| commit | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (patch) | |
| tree | c08e68a41b055bf9d7823ffd6f8843b72098f020 /include | |
| parent | bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (diff) | |
| parent | 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (diff) | |
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.h | 3 |
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 */ |
| 63 | extern struct e820map e820; | 64 | extern struct e820map e820; |
| 64 | extern struct e820map e820_saved; | 65 | extern struct e820map e820_saved; |
| @@ -115,7 +116,7 @@ extern void setup_memory_map(void); | |||
| 115 | extern char *default_machine_specific_memory_setup(void); | 116 | extern char *default_machine_specific_memory_setup(void); |
| 116 | extern char *machine_specific_memory_setup(void); | 117 | extern char *machine_specific_memory_setup(void); |
| 117 | extern char *memory_setup(void); | 118 | extern 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 |