5 files changed, 18 insertions, 14 deletions

diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index 8c6d76c9b2d6..d9907e57e9b9 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -270,7 +270,7 @@ uint32_t jz_gpio_port_get_value(int port, uint32_t mask)
 }
 EXPORT_SYMBOL(jz_gpio_port_get_value);
 
-#define IRQ_TO_BIT(irq) BIT(irq_to_gpio(irq) & 0x1f)
+#define IRQ_TO_BIT(irq) BIT((irq - JZ4740_IRQ_GPIO(0)) & 0x1f)
 
 static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int irq)
 {
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S
index 5ce3b746cedc..b4ac6374a38f 100644
--- a/arch/mips/kernel/r2300_fpu.S
+++ b/arch/mips/kernel/r2300_fpu.S
@@ -125,7 +125,7 @@ LEAF(_restore_fp_context)
         END(_restore_fp_context)
         .set    reorder
 
-        .type   fault@function
+        .type   fault, @function
         .ent    fault
 fault:  li      v0, -EFAULT
         jr      ra
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index f09546ee2cdc..17732f876eff 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -358,7 +358,7 @@ LEAF(_restore_msa_all_upper)
 
         .set    reorder
 
-        .type   fault@function
+        .type   fault, @function
         .ent    fault
 fault:  li      v0, -EFAULT                             # failure
         jr      ra
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index ae790c575d4f..bf14da9f3e33 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -690,15 +690,15 @@ static int simulate_sync(struct pt_regs *regs, unsigned int opcode)
 asmlinkage void do_ov(struct pt_regs *regs)
 {
         enum ctx_state prev_state;
-        siginfo_t info;
+        siginfo_t info = {
+                .si_signo = SIGFPE,
+                .si_code = FPE_INTOVF,
+                .si_addr = (void __user *)regs->cp0_epc,
+        };
 
         prev_state = exception_enter();
         die_if_kernel("Integer overflow", regs);
 
-        info.si_code = FPE_INTOVF;
-        info.si_signo = SIGFPE;
-        info.si_errno = 0;
-        info.si_addr = (void __user *) regs->cp0_epc;
         force_sig_info(SIGFPE, &info, current);
         exception_exit(prev_state);
 }
@@ -874,7 +874,7 @@ out:
 void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
         const char *str)
 {
-        siginfo_t info;
+        siginfo_t info = { 0 };
         char b[40];
 
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
@@ -903,7 +903,6 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
                 else
                         info.si_code = FPE_INTOVF;
                 info.si_signo = SIGFPE;
-                info.si_errno = 0;
                 info.si_addr = (void __user *) regs->cp0_epc;
                 force_sig_info(SIGFPE, &info, current);
                 break;
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 249647578e58..91dec32c77b7 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -164,11 +164,13 @@ static int __init mips_sc_probe_cm3(void)
 
         sets = cfg & CM_GCR_L2_CONFIG_SET_SIZE_MSK;
         sets >>= CM_GCR_L2_CONFIG_SET_SIZE_SHF;
-        c->scache.sets = 64 << sets;
+        if (sets)
+                c->scache.sets = 64 << sets;
 
         line_sz = cfg & CM_GCR_L2_CONFIG_LINE_SIZE_MSK;
         line_sz >>= CM_GCR_L2_CONFIG_LINE_SIZE_SHF;
-        c->scache.linesz = 2 << line_sz;
+        if (line_sz)
+                c->scache.linesz = 2 << line_sz;
 
         assoc = cfg & CM_GCR_L2_CONFIG_ASSOC_MSK;
         assoc >>= CM_GCR_L2_CONFIG_ASSOC_SHF;
@@ -176,9 +178,12 @@ static int __init mips_sc_probe_cm3(void)
         c->scache.waysize = c->scache.sets * c->scache.linesz;
         c->scache.waybit = __ffs(c->scache.waysize);
 
-        c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
+        if (c->scache.linesz) {
+                c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
+                return 1;
+        }
 
-        return 1;
+        return 0;
 }
 
 static inline int __init mips_sc_probe(void)