Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb53e9f3 authored by David Howells's avatar David Howells Committed by Ingo Molnar
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e32e58a9

arch/x86/mm/init_64.c

+2 −2
Original line number Diff line number Diff line
@@ -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);