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

Commit bbee3aec authored Nov 19, 2012 by Alexander Duyck Committed by H. Peter Anvin Nov 19, 2012

x86: Fix warning about cast from pointer to integer of different size

This patch fixes a warning reported by the kbuild test robot where we were
casting a pointer to a physical address which represents an integer of a
different size. Per the suggestion of Peter Anvin I am replacing it and one
other spot where I made a similar cast with an unsigned long.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Link: http://lkml.kernel.org/r/20121119182927.3655.7641.stgit@ahduyck-cp1.jf.intel.com

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent afd51a0e

arch/x86/kernel/head32.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ static void __init i386_default_early_setup(void)
	void __init i386_start_kernel(void)		void __init i386_start_kernel(void)
	{		{
	memblock_reserve(__pa_symbol(_text),		memblock_reserve(__pa_symbol(_text),
	(phys_addr_t)__bss_stop - (phys_addr_t)_text);		(unsigned long)__bss_stop - (unsigned long)_text);

	#ifdef CONFIG_BLK_DEV_INITRD		#ifdef CONFIG_BLK_DEV_INITRD
	/* Reserve INITRD */		/* Reserve INITRD */

arch/x86/kernel/head64.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,7 @@ void __init x86_64_start_reservations(char *real_mode_data)
	copy_bootdata(__va(real_mode_data));		copy_bootdata(__va(real_mode_data));

	memblock_reserve(__pa_symbol(_text),		memblock_reserve(__pa_symbol(_text),
	(phys_addr_t)__bss_stop - (phys_addr_t)_text);		(unsigned long)__bss_stop - (unsigned long)_text);

	#ifdef CONFIG_BLK_DEV_INITRD		#ifdef CONFIG_BLK_DEV_INITRD
	/* Reserve INITRD */		/* Reserve INITRD */