diff --git a/[refs] b/[refs] index 8370a59da69e..57852c6ee6b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b2600f8ee0536bb738f3387cf2c30e8e334e149 +refs/heads/master: eca9ad313293c41021bfcf23e985a14f6991a121 diff --git a/trunk/arch/x86/mm/srat.c b/trunk/arch/x86/mm/srat.c index 9994d2cacf72..81dbfdeb080d 100644 --- a/trunk/arch/x86/mm/srat.c +++ b/trunk/arch/x86/mm/srat.c @@ -138,7 +138,7 @@ static inline int save_add_info(void) {return 0;} void __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { - unsigned long start, end; + u64 start, end; int node, pxm; if (srat_disabled()) @@ -167,7 +167,7 @@ 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, + printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm, start, end); }