summaryrefslogtreecommitdiff
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
parentbdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (diff)
parent2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (diff)
downloadlinux-3.10-2b04be7e8ab5756ea36e137dd03c8773d184e67e.tar.gz
linux-3.10-2b04be7e8ab5756ea36e137dd03c8773d184e67e.tar.bz2
linux-3.10-2b04be7e8ab5756ea36e137dd03c8773d184e67e.zip
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
-rw-r--r--arch/x86/kernel/numaq_32.c2
-rw-r--r--arch/x86/mm/init_64.c2
-rw-r--r--include/asm-x86/e820.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 5b20a5e7ac2..a23e8233b9a 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -96,7 +96,7 @@ int __init get_memcfg_numaq(void)
void __init numaq_tsc_disable(void)
{
if (!found_numaq)
- return -1;
+ return;
if (num_online_nodes() > 1) {
printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de2435e00..306049edd55 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,
unsigned long pud_phys;
pud_t *pud;
- next = start + PGDIR_SIZE;
+ next = (start + PGDIR_SIZE) & PGDIR_MASK;
if (next > end)
next = end;
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 33e793e991d..06633b01dd5 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