aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 13:38:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 13:38:59 -0400
commit2b04be7e8ab5756ea36e137dd03c8773d184e67e (patch)
treec08e68a41b055bf9d7823ffd6f8843b72098f020 /arch
parentbdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (diff)
parent2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (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 'arch')
-rw-r--r--arch/x86/kernel/numaq_32.c2
-rw-r--r--arch/x86/mm/init_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 5b20a5e7ac28..a23e8233b9ac 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)
96void __init numaq_tsc_disable(void) 96void __init numaq_tsc_disable(void)
97{ 97{
98 if (!found_numaq) 98 if (!found_numaq)
99 return -1; 99 return;
100 100
101 if (num_online_nodes() > 1) { 101 if (num_online_nodes() > 1) {
102 printk(KERN_DEBUG "NUMAQ: disabling TSC\n"); 102 printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de2435e008..306049edd553 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,
644 unsigned long pud_phys; 644 unsigned long pud_phys;
645 pud_t *pud; 645 pud_t *pud;
646 646
647 next = start + PGDIR_SIZE; 647 next = (start + PGDIR_SIZE) & PGDIR_MASK;
648 if (next > end) 648 if (next > end)
649 next = end; 649 next = end;
650 650