diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 10:38:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 10:38:59 -0700 |
| commit | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (patch) | |
| tree | c08e68a41b055bf9d7823ffd6f8843b72098f020 /arch/x86 | |
| parent | bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (diff) | |
| parent | 2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c (diff) | |
| download | blackbird-op-linux-2b04be7e8ab5756ea36e137dd03c8773d184e67e.tar.gz blackbird-op-linux-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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/numaq_32.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/init_64.c | 2 |
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) 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 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, unsigned long pud_phys; pud_t *pud; - next = start + PGDIR_SIZE; + next = (start + PGDIR_SIZE) & PGDIR_MASK; if (next > end) next = end; |
