Merge branch 'linus' into cpumask-for-linus

Conflicts:
	arch/x86/kernel/cpu/common.c

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 4430a1f8fdf1..2950b97253b7 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -277,7 +277,8 @@ static void __init bootmem_init(void)
          * not selected. Once that done we can determine the low bound
          * of usable memory.
          */
-        reserved_end = max(init_initrd(), PFN_UP(__pa_symbol(&_end)));
+        reserved_end = max(init_initrd(),
+                           (unsigned long) PFN_UP(__pa_symbol(&_end)));
 
         /*
          * max_low_pfn is not a number of pages. The number of pages