Skip to content

Commit

Permalink
x86: fix an incompatible pointer type warning on 64-bit compilations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dhowells authored and Ingo Molnar committed Jun 12, 2008
1 parent e32e58a commit eb53e9f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/mm/init_64.c
Expand Up @@ -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)
Expand All @@ -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);
Expand Down

0 comments on commit eb53e9f

Please sign in to comment.