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, 9 insertions, 10 deletions

diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index c6580018c94b..cb9a14a1ca5b 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -89,7 +89,7 @@ static int sp_stopping = 0;
 #define MTSP_O_EXCL             0x0800
 #define MTSP_O_BINARY           0x8000
 
-#define SP_VPE 1
+extern int tclimit;
 
 struct apsp_table  {
         int sp;
@@ -225,8 +225,8 @@ void sp_work_handle_request(void)
         /* Run the syscall at the priviledge of the user who loaded the
            SP program */
 
-        if (vpe_getuid(SP_VPE))
-                sp_setfsuidgid( vpe_getuid(SP_VPE), vpe_getgid(SP_VPE));
+        if (vpe_getuid(tclimit))
+                sp_setfsuidgid(vpe_getuid(tclimit), vpe_getgid(tclimit));
 
         switch (sc.cmd) {
         /* needs the flags argument translating from SDE kit to
@@ -245,7 +245,7 @@ void sp_work_handle_request(void)
 
         case MTSP_SYSCALL_EXIT:
                 list_for_each_entry(n, &kspd_notifylist, list)
-                        n->kspd_sp_exit(SP_VPE);
+                        n->kspd_sp_exit(tclimit);
                 sp_stopping = 1;
 
                 printk(KERN_DEBUG "KSPD got exit syscall from SP exitcode %d\n",
@@ -255,7 +255,7 @@ void sp_work_handle_request(void)
         case MTSP_SYSCALL_OPEN:
                 generic.arg1 = translate_open_flags(generic.arg1);
 
-                vcwd = vpe_getcwd(SP_VPE);
+                vcwd = vpe_getcwd(tclimit);
 
                 /* change to the cwd of the process that loaded the SP program */
                 old_fs = get_fs();
@@ -283,7 +283,7 @@ void sp_work_handle_request(void)
                 break;
         } /* switch */
 
-        if (vpe_getuid(SP_VPE))
+        if (vpe_getuid(tclimit))
                 sp_setfsuidgid( 0, 0);
 
         old_fs = get_fs();
@@ -364,10 +364,9 @@ static void startwork(int vpe)
                 }
 
                 INIT_WORK(&work, sp_work);
-                queue_work(workqueue, &work);
-        } else
-                queue_work(workqueue, &work);
+        }
 
+        queue_work(workqueue, &work);
 }
 
 static void stopwork(int vpe)
@@ -389,7 +388,7 @@ static int kspd_module_init(void)
 
         notify.start = startwork;
         notify.stop = stopwork;
-        vpe_notify(SP_VPE, &notify);
+        vpe_notify(tclimit, &notify);
 
         return 0;
 }