4 files changed, 13 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 09f43f1bdd15..ccd91034d751 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3121,6 +3121,7 @@ F:	drivers/cpufreq/bmips-cpufreq.c
 BROADCOM BMIPS MIPS ARCHITECTURE
 M:      Kevin Cernekee <cernekee@gmail.com>
 M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      bcm-kernel-feedback-list@broadcom.com
 L:      linux-mips@vger.kernel.org
 T:      git git://github.com/broadcom/stblinux.git
 S:      Maintained
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 4a70c5de8c92..25a57895a3a3 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -210,12 +210,6 @@ const char *get_system_type(void)
         return ath79_sys_type;
 }
 
-int get_c0_perfcount_int(void)
-{
-        return ATH79_MISC_IRQ(5);
-}
-EXPORT_SYMBOL_GPL(get_c0_perfcount_int);
-
 unsigned int get_c0_compare_int(void)
 {
         return CP0_LEGACY_COMPARE_IRQ;
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index f158c5894a9a..feb2653490df 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -125,7 +125,7 @@ trace_a_syscall:
         subu    t1, v0,  __NR_O32_Linux
         move    a1, v0
         bnez    t1, 1f /* __NR_syscall at offset 0 */
-        lw      a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
+        ld      a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
         .set    pop
 
 1:      jal     syscall_trace_enter
diff --git a/drivers/irqchip/irq-ath79-misc.c b/drivers/irqchip/irq-ath79-misc.c
index aa7290784636..0390603170b4 100644
--- a/drivers/irqchip/irq-ath79-misc.c
+++ b/drivers/irqchip/irq-ath79-misc.c
@@ -22,6 +22,15 @@
 #define AR71XX_RESET_REG_MISC_INT_ENABLE        4
 
 #define ATH79_MISC_IRQ_COUNT                    32
+#define ATH79_MISC_PERF_IRQ                     5
+
+static int ath79_perfcount_irq;
+
+int get_c0_perfcount_int(void)
+{
+        return ath79_perfcount_irq;
+}
+EXPORT_SYMBOL_GPL(get_c0_perfcount_int);
 
 static void ath79_misc_irq_handler(struct irq_desc *desc)
 {
@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domain_init(
 {
         void __iomem *base = domain->host_data;
 
+        ath79_perfcount_irq = irq_create_mapping(domain, ATH79_MISC_PERF_IRQ);
+
         /* Disable and clear all interrupts */
         __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE);
         __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS);