5 files changed, 58 insertions, 33 deletions

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index c901c22d7ad0..8d006ec65677 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -14,6 +14,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/kbuild.h>
+#include <linux/suspend.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 
@@ -326,3 +327,15 @@ void output_octeon_cop2_state_defines(void)
         BLANK();
 }
 #endif
+
+#ifdef CONFIG_HIBERNATION
+void output_pbe_defines(void)
+{
+        COMMENT(" Linux struct pbe offsets. ");
+        OFFSET(PBE_ADDRESS, pbe, address);
+        OFFSET(PBE_ORIG_ADDRESS, pbe, orig_address);
+        OFFSET(PBE_NEXT, pbe, next);
+        DEFINE(PBE_SIZE, sizeof(struct pbe));
+        BLANK();
+}
+#endif
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 2e911e3da8d3..0037f21baf0d 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -20,22 +20,29 @@
 #define TIMER_CCD       0       /* 1/2 */
 #define TIMER_CLK(imclk)        ((imclk) / (2 << TIMER_CCD))
 
-static struct txx9_tmr_reg __iomem *txx9_cs_tmrptr;
+struct txx9_clocksource {
+        struct clocksource cs;
+        struct txx9_tmr_reg __iomem *tmrptr;
+};
 
 static cycle_t txx9_cs_read(struct clocksource *cs)
 {
-        return __raw_readl(&txx9_cs_tmrptr->trr);
+        struct txx9_clocksource *txx9_cs =
+                container_of(cs, struct txx9_clocksource, cs);
+        return __raw_readl(&txx9_cs->tmrptr->trr);
 }
 
 /* Use 1 bit smaller width to use full bits in that width */
 #define TXX9_CLOCKSOURCE_BITS (TXX9_TIMER_BITS - 1)
 
-static struct clocksource txx9_clocksource = {
-        .name           = "TXx9",
-        .rating         = 200,
-        .read           = txx9_cs_read,
-        .mask           = CLOCKSOURCE_MASK(TXX9_CLOCKSOURCE_BITS),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
+static struct txx9_clocksource txx9_clocksource = {
+        .cs = {
+                .name           = "TXx9",
+                .rating         = 200,
+                .read           = txx9_cs_read,
+                .mask           = CLOCKSOURCE_MASK(TXX9_CLOCKSOURCE_BITS),
+                .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
+        },
 };
 
 void __init txx9_clocksource_init(unsigned long baseaddr,
@@ -43,8 +50,8 @@ void __init txx9_clocksource_init(unsigned long baseaddr,
 {
         struct txx9_tmr_reg __iomem *tmrptr;
 
-        clocksource_set_clock(&txx9_clocksource, TIMER_CLK(imbusclk));
-        clocksource_register(&txx9_clocksource);
+        clocksource_set_clock(&txx9_clocksource.cs, TIMER_CLK(imbusclk));
+        clocksource_register(&txx9_clocksource.cs);
 
         tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
         __raw_writel(TCR_BASE, &tmrptr->tcr);
@@ -53,10 +60,13 @@ void __init txx9_clocksource_init(unsigned long baseaddr,
         __raw_writel(TXx9_TMITMR_TZCE, &tmrptr->itmr);
         __raw_writel(1 << TXX9_CLOCKSOURCE_BITS, &tmrptr->cpra);
         __raw_writel(TCR_BASE | TXx9_TMTCR_TCE, &tmrptr->tcr);
-        txx9_cs_tmrptr = tmrptr;
+        txx9_clocksource.tmrptr = tmrptr;
 }
 
-static struct txx9_tmr_reg __iomem *txx9_tmrptr;
+struct txx9_clock_event_device {
+        struct clock_event_device cd;
+        struct txx9_tmr_reg __iomem *tmrptr;
+};
 
 static void txx9tmr_stop_and_clear(struct txx9_tmr_reg __iomem *tmrptr)
 {
@@ -69,7 +79,9 @@ static void txx9tmr_stop_and_clear(struct txx9_tmr_reg __iomem *tmrptr)
 static void txx9tmr_set_mode(enum clock_event_mode mode,
                              struct clock_event_device *evt)
 {
-        struct txx9_tmr_reg __iomem *tmrptr = txx9_tmrptr;
+        struct txx9_clock_event_device *txx9_cd =
+                container_of(evt, struct txx9_clock_event_device, cd);
+        struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
 
         txx9tmr_stop_and_clear(tmrptr);
         switch (mode) {
@@ -99,7 +111,9 @@ static void txx9tmr_set_mode(enum clock_event_mode mode,
 static int txx9tmr_set_next_event(unsigned long delta,
                                   struct clock_event_device *evt)
 {
-        struct txx9_tmr_reg __iomem *tmrptr = txx9_tmrptr;
+        struct txx9_clock_event_device *txx9_cd =
+                container_of(evt, struct txx9_clock_event_device, cd);
+        struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
 
         txx9tmr_stop_and_clear(tmrptr);
         /* start timer */
@@ -108,18 +122,22 @@ static int txx9tmr_set_next_event(unsigned long delta,
         return 0;
 }
 
-static struct clock_event_device txx9tmr_clock_event_device = {
-        .name           = "TXx9",
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .rating         = 200,
-        .set_mode       = txx9tmr_set_mode,
-        .set_next_event = txx9tmr_set_next_event,
+static struct txx9_clock_event_device txx9_clock_event_device = {
+        .cd = {
+                .name           = "TXx9",
+                .features       = CLOCK_EVT_FEAT_PERIODIC |
+                                  CLOCK_EVT_FEAT_ONESHOT,
+                .rating         = 200,
+                .set_mode       = txx9tmr_set_mode,
+                .set_next_event = txx9tmr_set_next_event,
+        },
 };
 
 static irqreturn_t txx9tmr_interrupt(int irq, void *dev_id)
 {
-        struct clock_event_device *cd = &txx9tmr_clock_event_device;
-        struct txx9_tmr_reg __iomem *tmrptr = txx9_tmrptr;
+        struct txx9_clock_event_device *txx9_cd = dev_id;
+        struct clock_event_device *cd = &txx9_cd->cd;
+        struct txx9_tmr_reg __iomem *tmrptr = txx9_cd->tmrptr;
 
         __raw_writel(0, &tmrptr->tisr); /* ack interrupt */
         cd->event_handler(cd);
@@ -130,19 +148,20 @@ static struct irqaction txx9tmr_irq = {
         .handler        = txx9tmr_interrupt,
         .flags          = IRQF_DISABLED | IRQF_PERCPU,
         .name           = "txx9tmr",
+        .dev_id         = &txx9_clock_event_device,
 };
 
 void __init txx9_clockevent_init(unsigned long baseaddr, int irq,
                                  unsigned int imbusclk)
 {
-        struct clock_event_device *cd = &txx9tmr_clock_event_device;
+        struct clock_event_device *cd = &txx9_clock_event_device.cd;
         struct txx9_tmr_reg __iomem *tmrptr;
 
         tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
         txx9tmr_stop_and_clear(tmrptr);
         __raw_writel(TIMER_CCD, &tmrptr->ccdr);
         __raw_writel(0, &tmrptr->itmr);
-        txx9_tmrptr = tmrptr;
+        txx9_clock_event_device.tmrptr = tmrptr;
 
         clockevent_set_clock(cd, TIMER_CLK(imbusclk));
         cd->max_delta_ns =
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c
index 149cd914526e..5b457a40c784 100644
--- a/arch/mips/kernel/init_task.c
+++ b/arch/mips/kernel/init_task.c
@@ -11,10 +11,6 @@
 
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct mm_struct init_mm = INIT_MM(init_mm);
-
-EXPORT_SYMBOL(init_mm);
-
 /*
  * Initial thread structure.
  *
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 5f5af7d4c890..37d51cd124e9 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -924,6 +924,7 @@ void ipi_decode(struct smtc_ipi *pipi)
         int irq = MIPS_CPU_IRQ_BASE + 1;
 
         smtc_ipi_nq(&freeIPIq, pipi);
+
         switch (type_copy) {
         case SMTC_CLOCK_TICK:
                 irq_enter();
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index e83da174b533..08f1edf355e8 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1502,7 +1502,7 @@ void __cpuinit per_cpu_trap_init(void)
                          status_set);
 
         if (cpu_has_mips_r2) {
-                unsigned int enable = 0x0000000f;
+                unsigned int enable = 0x0000000f | cpu_hwrena_impl_bits;
 
                 if (!noulri && cpu_has_userlocal)
                         enable |= (1 << 29);
@@ -1510,10 +1510,6 @@ void __cpuinit per_cpu_trap_init(void)
                 write_c0_hwrena(enable);
         }
 
-#ifdef CONFIG_CPU_CAVIUM_OCTEON
-        write_c0_hwrena(0xc000000f); /* Octeon has register 30 and 31 */
-#endif
-
 #ifdef CONFIG_MIPS_MT_SMTC
         if (!secondaryTC) {
 #endif /* CONFIG_MIPS_MT_SMTC */