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] Treat R14000 like R10000.
  [MIPS] Remove EXPERIMENTAL from PAGE_SIZE_16KB
  [MIPS] Update/Fix instruction definitions
  [MIPS] DSP and MDMX share the same config flag bit.
  [MIPS] Fix deadlock on MP with cache aliases.
  [MIPS] Use generic STABS_DEBUG macro.
  [MIPS] Create consistency in "system type" selection.
  [MIPS] Use generic DWARF_DEBUG
  [MIPS] Fix kgdb exception handler from user mode.
  [MIPS] Update struct sigcontext member names
  [MIPS] Update/fix futex assembly
  [MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations.
  [MIPS] Fix detection and handling of the 74K processor.
  [MIPS] Add missing 34K processor IDs
  [MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical address
  [MIPS] AU1xxx mips_timer_interrupt() fixes
  [MIPS] Fix typo

9 files changed, 29 insertions, 75 deletions

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 92b28b674d6f..0facfaf4e950 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -272,8 +272,8 @@ void output_sc_defines(void)
         text("/* Linux sigcontext offsets. */");
         offset("#define SC_REGS       ", struct sigcontext, sc_regs);
         offset("#define SC_FPREGS     ", struct sigcontext, sc_fpregs);
-        offset("#define SC_MDHI       ", struct sigcontext, sc_hi);
-        offset("#define SC_MDLO       ", struct sigcontext, sc_lo);
+        offset("#define SC_MDHI       ", struct sigcontext, sc_mdhi);
+        offset("#define SC_MDLO       ", struct sigcontext, sc_mdlo);
         offset("#define SC_PC         ", struct sigcontext, sc_pc);
         offset("#define SC_FPC_CSR    ", struct sigcontext, sc_fpc_csr);
         linefeed;
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 58b3b14873cb..bef3e2dc7c52 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -121,6 +121,7 @@ static inline void check_wait(void)
         case CPU_24K:
         case CPU_25KF:
         case CPU_34K:
+        case CPU_74K:
         case CPU_PR4450:
                 cpu_wait = r4k_wait;
                 printk(" available.\n");
@@ -432,6 +433,15 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                              MIPS_CPU_LLSC;
                 c->tlbsize = 64;
                 break;
+        case PRID_IMP_R14000:
+                c->cputype = CPU_R14000;
+                c->isa_level = MIPS_CPU_ISA_IV;
+                c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
+                             MIPS_CPU_FPU | MIPS_CPU_32FPR |
+                             MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
+                             MIPS_CPU_LLSC;
+                c->tlbsize = 64;
+                break;
         }
 }
 
@@ -593,6 +603,9 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)
         case PRID_IMP_34K:
                 c->cputype = CPU_34K;
                 break;
+        case PRID_IMP_74K:
+                c->cputype = CPU_74K;
+                break;
         }
 }
 
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index d101d2fb24ca..a9c6de1b9542 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -101,7 +101,7 @@ FEXPORT(restore_all)			# restore full frame
         EMT
 1:
         mfc0    v1, CP0_TCSTATUS
-        /* We set IXMT above, XOR should cler it here */
+        /* We set IXMT above, XOR should clear it here */
         xori    v1, v1, TCSTATUS_IXMT
         or      v1, v0, v1
         mtc0    v1, CP0_TCSTATUS
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 10f28fb9f008..5fd7a8af0c62 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -54,9 +54,11 @@
                  */
                 mfc0    k0, CP0_CAUSE
                 andi    k0, k0, 0x7c
-                add     k1, k1, k0
-                PTR_L   k0, saved_vectors(k1)
-                jr      k0
+#ifdef CONFIG_64BIT
+                dsll    k0, k0, 1
+#endif
+                PTR_L   k1, saved_vectors(k0)
+                jr      k1
                 nop
 1:
                 move    k0, sp
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 84ab959f924a..9def554f335b 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -42,6 +42,7 @@ static const char *cpu_name[] = {
         [CPU_R8000]     = "R8000",
         [CPU_R10000]    = "R10000",
         [CPU_R12000]    = "R12000",
+        [CPU_R14000]    = "R14000",
         [CPU_R4300]     = "R4300",
         [CPU_R4650]     = "R4650",
         [CPU_R4700]     = "R4700",
@@ -74,6 +75,7 @@ static const char *cpu_name[] = {
         [CPU_24K]       = "MIPS 24K",
         [CPU_25KF]      = "MIPS 25Kf",
         [CPU_34K]       = "MIPS 34K",
+        [CPU_74K]       = "MIPS 74K",
         [CPU_VR4111]    = "NEC VR4111",
         [CPU_VR4121]    = "NEC VR4121",
         [CPU_VR4122]    = "NEC VR4122",
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 3ca786215d48..ce6cb915c0a7 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -31,7 +31,6 @@ setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
         save_gp_reg(31);
 #undef save_gp_reg
 
-#ifdef CONFIG_32BIT
         err |= __put_user(regs->hi, &sc->sc_mdhi);
         err |= __put_user(regs->lo, &sc->sc_mdlo);
         if (cpu_has_dsp) {
@@ -43,20 +42,6 @@ setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
                 err |= __put_user(mflo3(), &sc->sc_lo3);
                 err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
         }
-#endif
-#ifdef CONFIG_64BIT
-        err |= __put_user(regs->hi, &sc->sc_hi[0]);
-        err |= __put_user(regs->lo, &sc->sc_lo[0]);
-        if (cpu_has_dsp) {
-                err |= __put_user(mfhi1(), &sc->sc_hi[1]);
-                err |= __put_user(mflo1(), &sc->sc_lo[1]);
-                err |= __put_user(mfhi2(), &sc->sc_hi[2]);
-                err |= __put_user(mflo2(), &sc->sc_lo[2]);
-                err |= __put_user(mfhi3(), &sc->sc_hi[3]);
-                err |= __put_user(mflo3(), &sc->sc_lo[3]);
-                err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
-        }
-#endif
 
         err |= __put_user(!!used_math(), &sc->sc_used_math);
 
@@ -92,7 +77,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
         err |= __get_user(regs->cp0_epc, &sc->sc_pc);
-#ifdef CONFIG_32BIT
         err |= __get_user(regs->hi, &sc->sc_mdhi);
         err |= __get_user(regs->lo, &sc->sc_mdlo);
         if (cpu_has_dsp) {
@@ -104,20 +88,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
                 err |= __get_user(treg, &sc->sc_lo3); mtlo3(treg);
                 err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);
         }
-#endif
-#ifdef CONFIG_64BIT
-        err |= __get_user(regs->hi, &sc->sc_hi[0]);
-        err |= __get_user(regs->lo, &sc->sc_lo[0]);
-        if (cpu_has_dsp) {
-                err |= __get_user(treg, &sc->sc_hi[1]); mthi1(treg);
-                err |= __get_user(treg, &sc->sc_lo[1]); mthi1(treg);
-                err |= __get_user(treg, &sc->sc_hi[2]); mthi2(treg);
-                err |= __get_user(treg, &sc->sc_lo[2]); mthi2(treg);
-                err |= __get_user(treg, &sc->sc_hi[3]); mthi3(treg);
-                err |= __get_user(treg, &sc->sc_lo[3]); mthi3(treg);
-                err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);
-        }
-#endif
 
 #define restore_gp_reg(i) do {                                          \
         err |= __get_user(regs->regs[i], &sc->sc_regs[i]);              \
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 2aeaa2fd4b32..8f4fdd94dbd0 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -280,27 +280,6 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
         char    __user *name;
 
         switch(cmd) {
-        case SETNAME: {
-                char nodename[__NEW_UTS_LEN + 1];
-
-                if (!capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-
-                name = (char __user *) arg1;
-
-                len = strncpy_from_user(nodename, name, __NEW_UTS_LEN);
-                if (len < 0)
-                        return -EFAULT;
-
-                down_write(&uts_sem);
-                strncpy(system_utsname.nodename, nodename, len);
-                nodename[__NEW_UTS_LEN] = '\0';
-                strlcpy(system_utsname.nodename, nodename,
-                        sizeof(system_utsname.nodename));
-                up_write(&uts_sem);
-                return 0;
-        }
-
         case MIPS_ATOMIC_SET:
                 printk(KERN_CRIT "How did I get here?\n");
                 return -EINVAL;
@@ -313,9 +292,6 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
         case FLUSH_CACHE:
                 __flush_cache_all();
                 return 0;
-
-        case MIPS_RDNVRAM:
-                return -EIO;
         }
 
         return -EINVAL;
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 4901f0a37fca..35cb08da3820 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -902,6 +902,7 @@ static inline void parity_protection_init(void)
 {
         switch (current_cpu_data.cputype) {
         case CPU_24K:
+        case CPU_34K:
         case CPU_5KC:
                 write_c0_ecc(0x80000000);
                 back_to_back_c0_hazard();
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 14fa00e3cdfa..b84d1f9ce28e 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -151,23 +151,13 @@ SECTIONS
 
   /* This is the MIPS specific mdebug section.  */
   .mdebug : { *(.mdebug) }
-  /* These are needed for ELF backends which have not yet been
-     converted to the new style linker.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  /* DWARF debug sections.
-     Symbols in the .debug DWARF section are relative to the beginning of the
-     section so we begin .debug at 0.  It's not clear yet what needs to happen
-     for the others.   */
-  .debug          0 : { *(.debug) }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line) }
+
+  STABS_DEBUG
+
+  DWARF_DEBUG
+
   /* These must appear regardless of  .  */
   .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
   .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-  .comment : { *(.comment) }
   .note : { *(.note) }
 }