Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
  [MIPS] Add smp_call_function_single()
  [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
  [MIPS] Kexec: Fix several 64-bit bugs.
  [MIPS] Kexec: Fix several warnings.
  [MIPS] DDB5477: Remove support
  [MIPS] Fulong: Remove unneeded header file
  [MIPS] Cobalt: Enable UART on RaQ1
  [MIPS] Remove unused GROUP_TOSHIBA_NAMES
  [MIPS] remove some duplicate includes
  [MIPS] Oprofile: Fix rm9000 performance counter handler
  [MIPS] Use -Werror on subdirectories which build cleanly.
  [MIPS] Yosemite: Fix warning.
  [MIPS] PMON: Fix cpustart declaration.
  [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
  [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
  [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
  [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
  [MIPS] Delete unused arch/mips/gt64120/common/
  [MIPS] Fix build warning in unaligned load/store emulator.
  [MIPS] IP32: Don't ignore request_irq's return value.
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 8f42fa85ac9e..22960d67cf07 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -14,7 +14,7 @@
 #include <asm/page.h>
 
 extern const unsigned char relocate_new_kernel[];
-extern const unsigned int relocate_new_kernel_size;
+extern const size_t relocate_new_kernel_size;
 
 extern unsigned long kexec_start_address;
 extern unsigned long kexec_indirection_page;
@@ -40,6 +40,8 @@ machine_crash_shutdown(struct pt_regs *regs)
 {
 }
 
+typedef void (*noretfun_t)(void) __attribute__((noreturn));
+
 void
 machine_kexec(struct kimage *image)
 {
@@ -51,7 +53,8 @@ machine_kexec(struct kimage *image)
           (unsigned long)page_address(image->control_code_page);
 
         kexec_start_address = image->start;
-        kexec_indirection_page = phys_to_virt(image->head & PAGE_MASK);
+        kexec_indirection_page =
+                (unsigned long) phys_to_virt(image->head & PAGE_MASK);
 
         memcpy((void*)reboot_code_buffer, relocate_new_kernel,
                relocate_new_kernel_size);
@@ -67,7 +70,7 @@ machine_kexec(struct kimage *image)
                phys_to_virt(entry & PAGE_MASK) : ptr + 1) {
                 if (*ptr & IND_SOURCE || *ptr & IND_INDIRECTION ||
                     *ptr & IND_DESTINATION)
-                        *ptr = phys_to_virt(*ptr);
+                        *ptr = (unsigned long) phys_to_virt(*ptr);
         }
 
         /*
@@ -78,8 +81,8 @@ machine_kexec(struct kimage *image)
         flush_icache_range(reboot_code_buffer,
                            reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
 
-        printk("Will call new kernel at %08x\n", image->start);
+        printk("Will call new kernel at %08lx\n", image->start);
         printk("Bye ...\n");
         flush_cache_all();
-        ((void (*)(void))reboot_code_buffer)();
+        ((noretfun_t) reboot_code_buffer)();
 }