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()

7 files changed, 13 insertions, 11 deletions

diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 53f4171fc188..7a3ebbeba1f3 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -1055,7 +1055,9 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name)
 asmlinkage int sys32_personality(unsigned long personality)
 {
         int ret;
-        if (current->personality == PER_LINUX32 && personality == PER_LINUX)
+        personality &= 0xffffffff;
+        if (personality(current->personality) == PER_LINUX32 &&
+            personality == PER_LINUX)
                 personality = PER_LINUX32;
         ret = sys_personality(personality);
         if (ret == PER_LINUX32)
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
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 61362e6fa9ec..720fac3435d5 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -652,7 +652,8 @@ einval:	li	v0, -EINVAL
         sys     sys_vmsplice            4
         sys     sys_move_pages          6
         sys     sys_set_robust_list     2
-        sys     sys_get_robust_list     3
+        sys     sys_get_robust_list     3       /* 4310 */
+        sys     sys_ni_syscall          0
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 6c7b5ed0ea6e..3a34f62c8b1b 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -468,3 +468,4 @@ sys_call_table:
         PTR     sys_move_pages
         PTR     sys_set_robust_list
         PTR     sys_get_robust_list
+        PTR     sys_ni_syscall                  /* 5270 */
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 6d9f18727ac5..67b92a1d6c72 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -280,7 +280,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_sync
         PTR     sys_acct
         PTR     sys32_settimeofday
-        PTR     sys_mount                       /* 6160 */
+        PTR     compat_sys_mount                /* 6160 */
         PTR     sys_umount
         PTR     sys_swapon
         PTR     sys_swapoff
@@ -394,3 +394,4 @@ EXPORT(sysn32_call_table)
         PTR     sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list
+        PTR     sys_ni_syscall
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 2e6d0673163e..2875c4a3fa58 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -226,7 +226,7 @@ sys_call_table:
         PTR     sys_ni_syscall                  /* was sys_stat */
         PTR     sys_lseek
         PTR     sys_getpid                      /* 4020 */
-        PTR     sys_mount
+        PTR     compat_sys_mount
         PTR     sys_oldumount
         PTR     sys_setuid
         PTR     sys_getuid
@@ -516,4 +516,5 @@ sys_call_table:
         PTR     compat_sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list      /* 4310 */
+        PTR     sys_ni_syscall
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c
index 4aabe526a68e..a586aba337a7 100644
--- a/arch/mips/kernel/stacktrace.c
+++ b/arch/mips/kernel/stacktrace.c
@@ -57,7 +57,7 @@ static void save_context_stack(struct stack_trace *trace,
                 pc = unwind_stack(task, &sp, pc, &ra);
         } while (pc);
 #else
-        save_raw_context_stack(sp);
+        save_raw_context_stack(trace, sp);
 #endif
 }