16 files changed, 87 insertions, 104 deletions

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 84ac4d656310..adf583cd0c35 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -21,20 +21,12 @@
 
 #if defined(CONFIG_DEBUG_ICEDCC)
 
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
                 .macro  loadsp, rb, tmp
                 .endm
                 .macro  writeb, ch, rb
                 mcr     p14, 0, \ch, c0, c5, 0
                 .endm
-#elif defined(CONFIG_CPU_V7)
-                .macro  loadsp, rb, tmp
-                .endm
-                .macro  writeb, ch, rb
-wait:           mrc     p14, 0, pc, c0, c1, 0
-                bcs     wait
-                mcr     p14, 0, \ch, c0, c5, 0
-                .endm
 #elif defined(CONFIG_CPU_XSCALE)
                 .macro  loadsp, rb, tmp
                 .endm
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 4657e877bf8f..2df38263124c 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -36,7 +36,7 @@ extern void error(char *x);
 
 #ifdef CONFIG_DEBUG_ICEDCC
 
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
 
 static void icedcc_putc(int ch)
 {
@@ -52,16 +52,6 @@ static void icedcc_putc(int ch)
         asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch));
 }
 
-#elif defined(CONFIG_CPU_V7)
-
-static void icedcc_putc(int ch)
-{
-        asm(
-        "wait:  mrc     p14, 0, pc, c0, c1, 0                   \n\
-                bcs     wait                                    \n\
-                mcr     p14, 0, %0, c0, c5, 0                   "
-        : : "r" (ch));
-}
 
 #elif defined(CONFIG_CPU_XSCALE)
 
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index d86fcd44b220..e4ee050aad7d 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -159,31 +159,6 @@ static void __devinit pci_fixup_dec21285(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_dec21285);
 
 /*
- * Same as above. The PrPMC800 carrier board for the PrPMC1100 
- * card maps the host-bridge @ 00:01:00 for some reason and it
- * ends up getting scanned. Note that we only want to do this
- * fixup when we find the IXP4xx on a PrPMC system, which is why
- * we check the machine type. We could be running on a board
- * with an IXP4xx target device and we don't want to kill the
- * resources in that case.
- */
-static void __devinit pci_fixup_prpmc1100(struct pci_dev *dev)
-{
-        int i;
-
-        if (machine_is_prpmc1100()) {
-                dev->class &= 0xff;
-                dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
-                for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                        dev->resource[i].start = 0;
-                        dev->resource[i].end   = 0;
-                        dev->resource[i].flags = 0;
-                }
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IXP4XX, pci_fixup_prpmc1100);
-
-/*
  * PCI IDE controllers use non-standard I/O port decoding, respect it.
  */
 static void __devinit pci_fixup_ide_bases(struct pci_dev *dev)
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index d2d983be096d..bcd66e00bdbe 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -25,7 +25,7 @@
                 .macro  addruart, rp, rv
                 .endm
 
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
+#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
 
                 .macro  senduart, rd, rx
                 mcr     p14, 0, \rd, c0, c5, 0
@@ -49,23 +49,6 @@
 1002:
                 .endm
 
-#elif defined(CONFIG_CPU_V7)
-
-                .macro  senduart, rd, rx
-                mcr     p14, 0, \rd, c0, c5, 0
-                .endm
-
-                .macro  busyuart, rd, rx
-busy:           mrc     p14, 0, pc, c0, c1, 0
-                bcs     busy
-                .endm
-
-                .macro  waituart, rd, rx
-wait:           mrc     p14, 0, pc, c0, c1, 0
-                bcs     wait
-
-                .endm
-
 #elif defined(CONFIG_CPU_XSCALE)
 
                 .macro  senduart, rd, rx
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 052b509e2d5f..1bec8b5f22f0 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -338,7 +338,7 @@ static struct miscdevice etb_miscdev = {
         .fops = &etb_fops,
 };
 
-static int __init etb_probe(struct amba_device *dev, const struct amba_id *id)
+static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct tracectx *t = &tracer;
         int ret = 0;
@@ -530,7 +530,7 @@ static ssize_t trace_mode_store(struct kobject *kobj,
 static struct kobj_attribute trace_mode_attr =
         __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store);
 
-static int __init etm_probe(struct amba_device *dev, const struct amba_id *id)
+static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct tracectx *t = &tracer;
         int ret = 0;
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c
index 8f6ed43861f1..23891317dc4b 100644
--- a/arch/arm/kernel/kprobes-decode.c
+++ b/arch/arm/kernel/kprobes-decode.c
@@ -594,7 +594,8 @@ static void __kprobes emulate_ldr(struct kprobe *p, struct pt_regs *regs)
         long cpsr = regs->ARM_cpsr;
 
         fnr.dr = insnslot_llret_3arg_rflags(rnv, 0, rmv, cpsr, i_fn);
-        regs->uregs[rn] = fnr.r0;  /* Save Rn in case of writeback. */
+        if (rn != 15)
+                regs->uregs[rn] = fnr.r0;  /* Save Rn in case of writeback. */
         rdv = fnr.r1;
 
         if (rd == 15) {
@@ -622,10 +623,11 @@ static void __kprobes emulate_str(struct kprobe *p, struct pt_regs *regs)
         long rdv = (rd == 15) ? iaddr + str_pc_offset : regs->uregs[rd];
         long rnv = (rn == 15) ? iaddr +  8 : regs->uregs[rn];
         long rmv = regs->uregs[rm];  /* rm/rmv may be invalid, don't care. */
+        long rnv_wb;
 
-        /* Save Rn in case of writeback. */
-        regs->uregs[rn] =
-                insnslot_3arg_rflags(rnv, rdv, rmv, regs->ARM_cpsr, i_fn);
+        rnv_wb = insnslot_3arg_rflags(rnv, rdv, rmv, regs->ARM_cpsr, i_fn);
+        if (rn != 15)
+                regs->uregs[rn] = rnv_wb;  /* Save Rn in case of writeback. */
 }
 
 static void __kprobes emulate_mrrc(struct kprobe *p, struct pt_regs *regs)
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 22e194eb8536..69cfee0fe00f 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -79,6 +79,7 @@ struct arm_pmu {
         void            (*write_counter)(int idx, u32 val);
         void            (*start)(void);
         void            (*stop)(void);
+        void            (*reset)(void *);
         const unsigned  (*cache_map)[PERF_COUNT_HW_CACHE_MAX]
                                     [PERF_COUNT_HW_CACHE_OP_MAX]
                                     [PERF_COUNT_HW_CACHE_RESULT_MAX];
@@ -204,11 +205,9 @@ armpmu_event_set_period(struct perf_event *event,
 static u64
 armpmu_event_update(struct perf_event *event,
                     struct hw_perf_event *hwc,
-                    int idx)
+                    int idx, int overflow)
 {
-        int shift = 64 - 32;
-        s64 prev_raw_count, new_raw_count;
-        u64 delta;
+        u64 delta, prev_raw_count, new_raw_count;
 
 again:
         prev_raw_count = local64_read(&hwc->prev_count);
@@ -218,8 +217,13 @@ again:
                              new_raw_count) != prev_raw_count)
                 goto again;
 
-        delta = (new_raw_count << shift) - (prev_raw_count << shift);
-        delta >>= shift;
+        new_raw_count &= armpmu->max_period;
+        prev_raw_count &= armpmu->max_period;
+
+        if (overflow)
+                delta = armpmu->max_period - prev_raw_count + new_raw_count;
+        else
+                delta = new_raw_count - prev_raw_count;
 
         local64_add(delta, &event->count);
         local64_sub(delta, &hwc->period_left);
@@ -236,7 +240,7 @@ armpmu_read(struct perf_event *event)
         if (hwc->idx < 0)
                 return;
 
-        armpmu_event_update(event, hwc, hwc->idx);
+        armpmu_event_update(event, hwc, hwc->idx, 0);
 }
 
 static void
@@ -254,7 +258,7 @@ armpmu_stop(struct perf_event *event, int flags)
         if (!(hwc->state & PERF_HES_STOPPED)) {
                 armpmu->disable(hwc, hwc->idx);
                 barrier(); /* why? */
-                armpmu_event_update(event, hwc, hwc->idx);
+                armpmu_event_update(event, hwc, hwc->idx, 0);
                 hwc->state |= PERF_HES_STOPPED | PERF_HES_UPTODATE;
         }
 }
@@ -624,6 +628,19 @@ static struct pmu pmu = {
 #include "perf_event_v6.c"
 #include "perf_event_v7.c"
 
+/*
+ * Ensure the PMU has sane values out of reset.
+ * This requires SMP to be available, so exists as a separate initcall.
+ */
+static int __init
+armpmu_reset(void)
+{
+        if (armpmu && armpmu->reset)
+                return on_each_cpu(armpmu->reset, NULL, 1);
+        return 0;
+}
+arch_initcall(armpmu_reset);
+
 static int __init
 init_hw_perf_events(void)
 {
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c
index 6fc2d228db55..f1e8dd94afe8 100644
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
@@ -474,7 +474,7 @@ armv6pmu_handle_irq(int irq_num,
                         continue;
 
                 hwc = &event->hw;
-                armpmu_event_update(event, hwc, idx);
+                armpmu_event_update(event, hwc, idx, 1);
                 data.period = event->hw.last_period;
                 if (!armpmu_event_set_period(event, hwc, idx))
                         continue;
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 2e1402556fa0..4960686afb58 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -466,6 +466,7 @@ static inline unsigned long armv7_pmnc_read(void)
 static inline void armv7_pmnc_write(unsigned long val)
 {
         val &= ARMV7_PMNC_MASK;
+        isb();
         asm volatile("mcr p15, 0, %0, c9, c12, 0" : : "r"(val));
 }
 
@@ -502,6 +503,7 @@ static inline int armv7_pmnc_select_counter(unsigned int idx)
 
         val = (idx - ARMV7_EVENT_CNT_TO_CNTx) & ARMV7_SELECT_MASK;
         asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (val));
+        isb();
 
         return idx;
 }
@@ -780,7 +782,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)
                         continue;
 
                 hwc = &event->hw;
-                armpmu_event_update(event, hwc, idx);
+                armpmu_event_update(event, hwc, idx, 1);
                 data.period = event->hw.last_period;
                 if (!armpmu_event_set_period(event, hwc, idx))
                         continue;
@@ -847,6 +849,18 @@ static int armv7pmu_get_event_idx(struct cpu_hw_events *cpuc,
         }
 }
 
+static void armv7pmu_reset(void *info)
+{
+        u32 idx, nb_cnt = armpmu->num_events;
+
+        /* The counter and interrupt enable registers are unknown at reset. */
+        for (idx = 1; idx < nb_cnt; ++idx)
+                armv7pmu_disable_event(NULL, idx);
+
+        /* Initialize & Reset PMNC: C and P bits */
+        armv7_pmnc_write(ARMV7_PMNC_P | ARMV7_PMNC_C);
+}
+
 static struct arm_pmu armv7pmu = {
         .handle_irq             = armv7pmu_handle_irq,
         .enable                 = armv7pmu_enable_event,
@@ -856,17 +870,15 @@ static struct arm_pmu armv7pmu = {
         .get_event_idx          = armv7pmu_get_event_idx,
         .start                  = armv7pmu_start,
         .stop                   = armv7pmu_stop,
+        .reset                  = armv7pmu_reset,
         .raw_event_mask         = 0xFF,
         .max_period             = (1LLU << 32) - 1,
 };
 
-static u32 __init armv7_reset_read_pmnc(void)
+static u32 __init armv7_read_num_pmnc_events(void)
 {
         u32 nb_cnt;
 
-        /* Initialize & Reset PMNC: C and P bits */
-        armv7_pmnc_write(ARMV7_PMNC_P | ARMV7_PMNC_C);
-
         /* Read the nb of CNTx counters supported from PMNC */
         nb_cnt = (armv7_pmnc_read() >> ARMV7_PMNC_N_SHIFT) & ARMV7_PMNC_N_MASK;
 
@@ -880,7 +892,7 @@ static const struct arm_pmu *__init armv7_a8_pmu_init(void)
         armv7pmu.name           = "ARMv7 Cortex-A8";
         armv7pmu.cache_map      = &armv7_a8_perf_cache_map;
         armv7pmu.event_map      = &armv7_a8_perf_map;
-        armv7pmu.num_events     = armv7_reset_read_pmnc();
+        armv7pmu.num_events     = armv7_read_num_pmnc_events();
         return &armv7pmu;
 }
 
@@ -890,7 +902,7 @@ static const struct arm_pmu *__init armv7_a9_pmu_init(void)
         armv7pmu.name           = "ARMv7 Cortex-A9";
         armv7pmu.cache_map      = &armv7_a9_perf_cache_map;
         armv7pmu.event_map      = &armv7_a9_perf_map;
-        armv7pmu.num_events     = armv7_reset_read_pmnc();
+        armv7pmu.num_events     = armv7_read_num_pmnc_events();
         return &armv7pmu;
 }
 #else
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c
index 28cd3b025bc3..39affbe4fdb2 100644
--- a/arch/arm/kernel/perf_event_xscale.c
+++ b/arch/arm/kernel/perf_event_xscale.c
@@ -246,7 +246,7 @@ xscale1pmu_handle_irq(int irq_num, void *dev)
                         continue;
 
                 hwc = &event->hw;
-                armpmu_event_update(event, hwc, idx);
+                armpmu_event_update(event, hwc, idx, 1);
                 data.period = event->hw.last_period;
                 if (!armpmu_event_set_period(event, hwc, idx))
                         continue;
@@ -578,7 +578,7 @@ xscale2pmu_handle_irq(int irq_num, void *dev)
                         continue;
 
                 hwc = &event->hw;
-                armpmu_event_update(event, hwc, idx);
+                armpmu_event_update(event, hwc, idx, 1);
                 data.period = event->hw.last_period;
                 if (!armpmu_event_set_period(event, hwc, idx))
                         continue;
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index bfad698a02e7..6398ead9d1c0 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -119,11 +119,19 @@ ENTRY(cpu_resume)
 #else
         ldr     r0, sleep_save_sp       @ stack phys addr
 #endif
-        msr     cpsr_c, #PSR_I_BIT | PSR_F_BIT | SVC_MODE @ set SVC, irqs off
+        setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1  @ set SVC, irqs off
 #ifdef MULTI_CPU
-        ldmia   r0!, {r1, sp, lr, pc}   @ load v:p, stack, return fn, resume fn
+        @ load v:p, stack, return fn, resume fn
+  ARM(  ldmia   r0!, {r1, sp, lr, pc}   )
+THUMB(  ldmia   r0!, {r1, r2, r3, r4}   )
+THUMB(  mov     sp, r2                  )
+THUMB(  mov     lr, r3                  )
+THUMB(  bx      r4                      )
 #else
-        ldmia   r0!, {r1, sp, lr}       @ load v:p, stack, return fn
+        @ load v:p, stack, return fn
+  ARM(  ldmia   r0!, {r1, sp, lr}       )
+THUMB(  ldmia   r0!, {r1, r2, lr}       )
+THUMB(  mov     sp, r2                  )
         b       cpu_do_resume
 #endif
 ENDPROC(cpu_resume)
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h
index e5fcdd3f5bf5..b20ec9af7882 100644
--- a/arch/arm/mach-dove/include/mach/dove.h
+++ b/arch/arm/mach-dove/include/mach/dove.h
@@ -136,7 +136,7 @@
 #define DOVE_MPP_GENERAL_VIRT_BASE      (DOVE_SB_REGS_VIRT_BASE | 0xe803c)
 #define  DOVE_AU1_SPDIFO_GPIO_EN        (1 << 1)
 #define  DOVE_NAND_GPIO_EN              (1 << 0)
-#define DOVE_MPP_CTRL4_VIRT_BASE        (DOVE_GPIO_VIRT_BASE + 0x40)
+#define DOVE_MPP_CTRL4_VIRT_BASE        (DOVE_GPIO_LO_VIRT_BASE + 0x40)
 #define  DOVE_SPI_GPIO_SEL              (1 << 5)
 #define  DOVE_UART1_GPIO_SEL            (1 << 4)
 #define  DOVE_AU1_GPIO_SEL              (1 << 3)
diff --git a/arch/arm/mach-dove/mpp.c b/arch/arm/mach-dove/mpp.c
index 71db2bdf2f28..c66c76346904 100644
--- a/arch/arm/mach-dove/mpp.c
+++ b/arch/arm/mach-dove/mpp.c
@@ -147,9 +147,6 @@ void __init dove_mpp_conf(unsigned int *mpp_list)
         u32 pmu_sig_ctrl[PMU_SIG_REGS];
         int i;
 
-        /* Initialize gpiolib. */
-        orion_gpio_init();
-
         for (i = 0; i < MPP_NR_REGS; i++)
                 mpp_ctrl[i] = readl(MPP_CTRL(i));
 
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 0a95063f6d32..17de0bf53c08 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -58,6 +58,12 @@ static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
 
 static struct gpio_led sheevaplug_led_pins[] = {
         {
+                .name                   = "plug:red:misc",
+                .default_trigger        = "none",
+                .gpio                   = 46,
+                .active_low             = 1,
+        },
+        {
                 .name                   = "plug:green:health",
                 .default_trigger        = "default-on",
                 .gpio                   = 49,
@@ -80,6 +86,7 @@ static struct platform_device sheevaplug_leds = {
 
 static unsigned int sheevaplug_mpp_config[] __initdata = {
         MPP29_GPIO,     /* USB Power Enable */
+        MPP46_GPIO,     /* LED Red */
         MPP49_GPIO,     /* LED */
         0
 };
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 8554707d20a9..edb1dd2d1611 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -402,7 +402,7 @@ static void ts78xx_fpga_supports(void)
                 /* enable devices if magic matches */
                 switch ((ts78xx_fpga.id >> 8) & 0xffffff) {
                 case TS7800_FPGA_MAGIC:
-                        printk(KERN_WARNING "TS-7800 FPGA: unrecognized revision 0x%.2x\n",
+                        pr_warning("TS-7800 FPGA: unrecognized revision 0x%.2x\n",
                                         ts78xx_fpga.id & 0xff);
                         ts78xx_fpga.supports.ts_rtc.present = 1;
                         ts78xx_fpga.supports.ts_nand.present = 1;
@@ -423,7 +423,7 @@ static int ts78xx_fpga_load_devices(void)
         if (ts78xx_fpga.supports.ts_rtc.present == 1) {
                 tmp = ts78xx_ts_rtc_load();
                 if (tmp) {
-                        printk(KERN_INFO "TS-78xx: RTC not registered\n");
+                        pr_info("TS-78xx: RTC not registered\n");
                         ts78xx_fpga.supports.ts_rtc.present = 0;
                 }
                 ret |= tmp;
@@ -431,7 +431,7 @@ static int ts78xx_fpga_load_devices(void)
         if (ts78xx_fpga.supports.ts_nand.present == 1) {
                 tmp = ts78xx_ts_nand_load();
                 if (tmp) {
-                        printk(KERN_INFO "TS-78xx: NAND not registered\n");
+                        pr_info("TS-78xx: NAND not registered\n");
                         ts78xx_fpga.supports.ts_nand.present = 0;
                 }
                 ret |= tmp;
@@ -439,7 +439,7 @@ static int ts78xx_fpga_load_devices(void)
         if (ts78xx_fpga.supports.ts_rng.present == 1) {
                 tmp = ts78xx_ts_rng_load();
                 if (tmp) {
-                        printk(KERN_INFO "TS-78xx: RNG not registered\n");
+                        pr_info("TS-78xx: RNG not registered\n");
                         ts78xx_fpga.supports.ts_rng.present = 0;
                 }
                 ret |= tmp;
@@ -466,7 +466,7 @@ static int ts78xx_fpga_load(void)
 {
         ts78xx_fpga.id = readl(TS78XX_FPGA_REGS_VIRT_BASE);
 
-        printk(KERN_INFO "TS-78xx FPGA: magic=0x%.6x, rev=0x%.2x\n",
+        pr_info("TS-78xx FPGA: magic=0x%.6x, rev=0x%.2x\n",
                         (ts78xx_fpga.id >> 8) & 0xffffff,
                         ts78xx_fpga.id & 0xff);
 
@@ -494,7 +494,7 @@ static int ts78xx_fpga_unload(void)
          * UrJTAG SVN since r1381 can be used to reprogram the FPGA
          */
         if (ts78xx_fpga.id != fpga_id) {
-                printk(KERN_ERR "TS-78xx FPGA: magic/rev mismatch\n"
+                pr_err("TS-78xx FPGA: magic/rev mismatch\n"
                         "TS-78xx FPGA: was 0x%.6x/%.2x but now 0x%.6x/%.2x\n",
                         (ts78xx_fpga.id >> 8) & 0xffffff, ts78xx_fpga.id & 0xff,
                         (fpga_id >> 8) & 0xffffff, fpga_id & 0xff);
@@ -525,7 +525,7 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj,
         int value, ret;
 
         if (ts78xx_fpga.state < 0) {
-                printk(KERN_ERR "TS-78xx FPGA: borked, you must powercycle asap\n");
+                pr_err("TS-78xx FPGA: borked, you must powercycle asap\n");
                 return -EBUSY;
         }
 
@@ -534,7 +534,7 @@ static ssize_t ts78xx_fpga_store(struct kobject *kobj,
         else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)
                 value = 0;
         else {
-                printk(KERN_ERR "ts78xx_fpga_store: Invalid value\n");
+                pr_err("ts78xx_fpga_store: Invalid value\n");
                 return -EINVAL;
         }
 
@@ -616,7 +616,7 @@ static void __init ts78xx_init(void)
         ret = ts78xx_fpga_load();
         ret = sysfs_create_file(power_kobj, &ts78xx_fpga_attr.attr);
         if (ret)
-                printk(KERN_ERR "sysfs_create_file failed: %d\n", ret);
+                pr_err("sysfs_create_file failed: %d\n", ret);
 }
 
 MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC")
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 2ecc1d94284e..10e75faba4c9 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -348,7 +348,7 @@ static void __init gic_init_irq(void)
 
 #ifndef CONFIG_REALVIEW_EB_ARM11MP_REVB
                 /* board GIC, secondary */
-                gic_init(1, 64, __io_address(REALVIEW_EB_GIC_DIST_BASE),
+                gic_init(1, 96, __io_address(REALVIEW_EB_GIC_DIST_BASE),
                          __io_address(REALVIEW_EB_GIC_CPU_BASE));
                 gic_cascade_irq(1, IRQ_EB11MP_EB_IRQ1);
 #endif