From 2b45147db88543ee92607b16336edf8243273e71 Mon Sep 17 00:00:00 2001 From: David Howells Date: Sat, 7 Jun 2008 17:18:40 +0100 Subject: [PATCH] --- yaml --- r: 98039 b: refs/heads/master c: eb53e9f3ea859a6d59c37b500593b970aa8562e6 h: refs/heads/master i: 98037: 2163f6f7445b794beaef270f82267d20e9fee5b5 98035: 8f827732adb2ef6981ef3167d0934363f99a80b3 98031: 06819f09fe14bbcce2949499e0e100308d362ac9 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ef59991260e..4e884a16ebd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e32e58a96de4ac35a03349db2ab69f263ded958f +refs/heads/master: eb53e9f3ea859a6d59c37b500593b970aa8562e6 diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index 156e6d7b0e32..998a06ea5f7d 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -506,7 +506,7 @@ early_param("memtest", parse_memtest); static void __init early_memtest(unsigned long start, unsigned long end) { - u64 t_start, t_size; + unsigned long t_start, t_size; unsigned pattern; if (!memtest_pattern) @@ -525,7 +525,7 @@ static void __init early_memtest(unsigned long start, unsigned long end) if (t_start + t_size > end) t_size = end - t_start; - printk(KERN_CONT "\n %016llx - %016llx pattern %d", + printk(KERN_CONT "\n %016lx - %016lx pattern %d", t_start, t_start + t_size, pattern); memtest(t_start, t_size, pattern);