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, 18 insertions, 6 deletions

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 8cf24d716d41..aab89e97abb5 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -40,12 +40,11 @@
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/processor.h>
+#include <asm/mips_mt.h>
 #include <asm/system.h>
 #include <asm/vpe.h>
 #include <asm/rtlx.h>
 
-#define RTLX_TARG_VPE 1
-
 static struct rtlx_info *rtlx;
 static int major;
 static char module_name[] = "rtlx";
@@ -165,10 +164,10 @@ int rtlx_open(int index, int can_sleep)
         }
 
         if (rtlx == NULL) {
-                if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
+                if( (p = vpe_get_shared(tclimit)) == NULL) {
                         if (can_sleep) {
                                 __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                           (p = vpe_get_shared(RTLX_TARG_VPE)),
+                                                           (p = vpe_get_shared(tclimit)),
                                                            ret);
                                 if (ret)
                                         goto out_fail;
@@ -472,11 +471,24 @@ static int rtlx_irq_num = MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ;
 static char register_chrdev_failed[] __initdata =
         KERN_ERR "rtlx_module_init: unable to register device\n";
 
-static int rtlx_module_init(void)
+static int __init rtlx_module_init(void)
 {
         struct device *dev;
         int i, err;
 
+        if (!cpu_has_mipsmt) {
+                printk("VPE loader: not a MIPS MT capable processor\n");
+                return -ENODEV;
+        }
+
+        if (tclimit == 0) {
+                printk(KERN_WARNING "No TCs reserved for AP/SP, not "
+                       "initializing RTLX.\nPass maxtcs=<n> argument as kernel "
+                       "argument\n");
+
+                return -ENODEV;
+        }
+
         major = register_chrdev(0, module_name, &rtlx_fops);
         if (major < 0) {
                 printk(register_chrdev_failed);
@@ -501,7 +513,7 @@ static int rtlx_module_init(void)
         /* set up notifiers */
         notify.start = starting;
         notify.stop = stopping;
-        vpe_notify(RTLX_TARG_VPE, &notify);
+        vpe_notify(tclimit, &notify);
 
         if (cpu_has_vint)
                 set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);