diff options
| author | David Howells <dhowells@redhat.com> | 2008-06-07 17:18:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 21:27:15 +0200 |
| commit | eb53e9f3ea859a6d59c37b500593b970aa8562e6 (patch) | |
| tree | b3fa069932152f55ee304348e2b5a22758950aa0 | |
| parent | e32e58a96de4ac35a03349db2ab69f263ded958f (diff) | |
| download | kernel_samsung_aries-eb53e9f3ea859a6d59c37b500593b970aa8562e6.zip kernel_samsung_aries-eb53e9f3ea859a6d59c37b500593b970aa8562e6.tar.gz kernel_samsung_aries-eb53e9f3ea859a6d59c37b500593b970aa8562e6.tar.bz2 | |
x86: fix an incompatible pointer type warning on 64-bit compilations
Fix an incompatible pointer type warning on x86_64 compilations.
early_memtest() is passing a u64* to find_e820_area_size() which is expecting
an unsigned long. Change t_start and t_size to unsigned long as those are
also 64-bit types on x88_64.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/mm/init_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 156e6d7..998a06e 100644 --- a/arch/x86/mm/init_64.c +++ b/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); |