diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /arch/x86/mm | |
parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/srat_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
156 | 156 | ||
157 | num_memory_chunks++; | 157 | num_memory_chunks++; |
158 | 158 | ||
159 | printk(KERN_DEBUG "Memory range %08lx to %08lx (type %x)" | 159 | printk(KERN_DEBUG "Memory range %08lx to %08lx" |
160 | " in proximity domain %02x %s\n", | 160 | " in proximity domain %02x %s\n", |
161 | start_pfn, end_pfn, | 161 | start_pfn, end_pfn, |
162 | memory_affinity->memory_type, | ||
163 | pxm, | 162 | pxm, |
164 | ((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ? | 163 | ((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ? |
165 | "enabled and removable" : "enabled" ) ); | 164 | "enabled and removable" : "enabled" ) ); |