summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 12:20:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 12:20:23 +0200
commitcd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch)
tree9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /arch/x86/mm
parent6879827f4e08da219c99b91e4e1d793a924103e3 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/srat_32.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index f41d67f8f83..1eb2973a301 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" ) );