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 wrong checksum calculation on 64-bit MIPS
  [MIPS] VPE loader: Initialize lists before they're actually being used ...
  [MIPS] Fix reported amount of freed memory - it's in kB not bytes
  [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard()
  [MIPS] SMTC: Fix module build by exporting symbol
  [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries
  [MIPS] Fix APM build
  [MIPS] There is no __GNUC_MAJOR__

2 files changed, 13 insertions, 6 deletions

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 44238ab2fc99..6a857bf030b0 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -4,6 +4,7 @@
 #include <linux/sched.h>
 #include <linux/cpumask.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 
 #include <asm/cpu.h>
 #include <asm/processor.h>
@@ -270,9 +271,12 @@ void smtc_configure_tlb(void)
                  * of their initialization in smtc_cpu_setup().
                  */
 
-                tlbsiz = tlbsiz & 0x3f; /* MIPS32 limits TLB indices to 64 */
-                cpu_data[0].tlbsize = tlbsiz;
+                /* MIPS32 limits TLB indices to 64 */
+                if (tlbsiz > 64)
+                        tlbsiz = 64;
+                cpu_data[0].tlbsize = current_cpu_data.tlbsize = tlbsiz;
                 smtc_status |= SMTC_TLB_SHARED;
+                local_flush_tlb_all();
 
                 printk("TLB of %d entry pairs shared by %d VPEs\n",
                         tlbsiz, vpes);
@@ -1044,6 +1048,8 @@ void smtc_ipi_replay(void)
         }
 }
 
+EXPORT_SYMBOL(smtc_ipi_replay);
+
 void smtc_idle_loop_hook(void)
 {
 #ifdef SMTC_IDLE_HOOK_DEBUG
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 666bef484dcb..458fccf87c54 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -139,13 +139,16 @@ struct tc {
         struct list_head list;
 };
 
-struct vpecontrol_ {
+struct {
         /* Virtual processing elements */
         struct list_head vpe_list;
 
         /* Thread contexts */
         struct list_head tc_list;
-} vpecontrol;
+} vpecontrol = {
+        .vpe_list = LIST_HEAD_INIT(vpecontrol.vpe_list),
+        .tc_list = LIST_HEAD_INIT(vpecontrol.tc_list)
+};
 
 static void release_progmem(void *ptr);
 /* static __attribute_used__ void dump_vpe(struct vpe * v); */
@@ -1388,8 +1391,6 @@ static int __init vpe_module_init(void)
 
         /* dump_mtregs(); */
 
-        INIT_LIST_HEAD(&vpecontrol.vpe_list);
-        INIT_LIST_HEAD(&vpecontrol.tc_list);
 
         val = read_c0_mvpconf0();
         for (i = 0; i < ((val & MVPCONF0_PTC) + 1); i++) {