diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 23:57:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 23:57:20 +0200 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /arch/x86/mm | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | kernel-common-393d81aa026e19b6ede6f5f11955c97ee62e5df5.tar.gz kernel-common-393d81aa026e19b6ede6f5f11955c97ee62e5df5.tar.bz2 kernel-common-393d81aa026e19b6ede6f5f11955c97ee62e5df5.zip | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/init_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/srat_32.c | 3 |
2 files changed, 2 insertions, 3 deletions
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; diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index f41d67f8f831..1eb2973a301c 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c @@ -156,10 +156,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity) num_memory_chunks++; - printk(KERN_DEBUG "Memory range %08lx to %08lx (type %x)" + printk(KERN_DEBUG "Memory range %08lx to %08lx" " in proximity domain %02x %s\n", start_pfn, end_pfn, - memory_affinity->memory_type, pxm, ((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ? "enabled and removable" : "enabled" ) ); |