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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix iounmap argument to const volatile.
  [MIPS] Reserve syscall numbers for kexec_load.
  [MIPS] Update tb0287_defconfig
  [MIPS] Update pnx8550-v2pci_defconfig
  [MIPS] Update pnx8500-jbs_defconfig
  [MIPS] More vr41xx pt_regs fixups
  [MIPS] save_context_stack fix
  [MIPS] Use compat_sys_mount.
  [MIPS] Fix O32 personality(2) call with 0xffffffff argument.
  [MIPS] A few more pt_regs fixups.
  [MIPS] Malta: Fix uninitialized regs pointer.
  [MIPS] Delete unneeded pt_regs forward declaration.
  [MIPS] Use kallsyms_lookup_size_offset() instead of kallsyms_lookup()

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 9f307eb1a31e..ec8209f3a0c6 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -358,10 +358,8 @@ static int __init frame_info_init(void)
         unsigned long size = 0;
 #ifdef CONFIG_KALLSYMS
         unsigned long ofs;
-        char *modname;
-        char namebuf[KSYM_NAME_LEN + 1];
 
-        kallsyms_lookup((unsigned long)schedule, &size, &ofs, &modname, namebuf);
+        kallsyms_lookup_size_offset((unsigned long)schedule, &size, &ofs);
 #endif
         schedule_mfi.func = schedule;
         schedule_mfi.func_size = size;
@@ -403,8 +401,6 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
 {
         unsigned long stack_page;
         struct mips_frame_info info;
-        char *modname;
-        char namebuf[KSYM_NAME_LEN + 1];
         unsigned long size, ofs;
         int leaf;
         extern void ret_from_irq(void);
@@ -433,7 +429,7 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
                 }
                 return 0;
         }
-        if (!kallsyms_lookup(pc, &size, &ofs, &modname, namebuf))
+        if (!kallsyms_lookup_size_offset(pc, &size, &ofs))
                 return 0;
         /*
          * Return ra if an exception occured at the first instruction