diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 14:45:58 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 14:45:58 +0200 |
| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
| tree | b913718405d44a921905ac71044fbde410256865 /arch/x86/mm/srat.c | |
| parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e (diff) | |
| parent | 89abfab133ef1f5902abafb744df72793213ac19 (diff) | |
Merge branch 'master' into for-next
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/x86/mm/srat.c')
| -rw-r--r-- | arch/x86/mm/srat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index efb5b4b9371..732af3a9618 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -176,8 +176,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) return; } - printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm, - start, end); + printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n", + node, pxm, + (unsigned long long) start, (unsigned long long) end - 1); } void __init acpi_numa_arch_fixup(void) {} |