diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2012-11-19 13:31:37 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-19 13:45:19 -0500 |
commit | bbee3aec3472fc2ca10b6b1020aec84567ea25ce (patch) | |
tree | 3fbb99d8f84eabd37046048963f4bec03af965f4 /arch/x86/kernel | |
parent | afd51a0e32cd79261f0e823400886ed322a355ac (diff) |
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>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/head32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/head64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index f15db0c40713..e17554832991 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c | |||
@@ -31,7 +31,7 @@ static void __init i386_default_early_setup(void) | |||
31 | void __init i386_start_kernel(void) | 31 | void __init i386_start_kernel(void) |
32 | { | 32 | { |
33 | memblock_reserve(__pa_symbol(_text), | 33 | memblock_reserve(__pa_symbol(_text), |
34 | (phys_addr_t)__bss_stop - (phys_addr_t)_text); | 34 | (unsigned long)__bss_stop - (unsigned long)_text); |
35 | 35 | ||
36 | #ifdef CONFIG_BLK_DEV_INITRD | 36 | #ifdef CONFIG_BLK_DEV_INITRD |
37 | /* Reserve INITRD */ | 37 | /* Reserve INITRD */ |
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 42f5df134341..7b215a50ec1e 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c | |||
@@ -98,7 +98,7 @@ void __init x86_64_start_reservations(char *real_mode_data) | |||
98 | copy_bootdata(__va(real_mode_data)); | 98 | copy_bootdata(__va(real_mode_data)); |
99 | 99 | ||
100 | memblock_reserve(__pa_symbol(_text), | 100 | memblock_reserve(__pa_symbol(_text), |
101 | (phys_addr_t)__bss_stop - (phys_addr_t)_text); | 101 | (unsigned long)__bss_stop - (unsigned long)_text); |
102 | 102 | ||
103 | #ifdef CONFIG_BLK_DEV_INITRD | 103 | #ifdef CONFIG_BLK_DEV_INITRD |
104 | /* Reserve INITRD */ | 104 | /* Reserve INITRD */ |