diff --git a/[refs] b/[refs] index 0134bd4efdf9..e6435415da69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e9ea2656b656edd3c8de98675bbc0340211b5bd +refs/heads/master: 8f3c5883d840d079a5d2db20893b5ac8ba453b40 diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c index 60aeeb56948f..e4056321b243 100644 --- a/trunk/arch/x86/xen/setup.c +++ b/trunk/arch/x86/xen/setup.c @@ -113,7 +113,7 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr, len++; } } - printk(KERN_CONT "%ld pages freed\n", len); + printk(KERN_CONT "%lu pages freed\n", len); return len; } @@ -139,7 +139,7 @@ static unsigned long __init xen_return_unused_memory(unsigned long max_pfn, if (last_end < max_addr) released += xen_release_chunk(last_end, max_addr); - printk(KERN_INFO "released %ld pages of unused memory\n", released); + printk(KERN_INFO "released %lu pages of unused memory\n", released); return released; }