Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

7 files changed, 182 insertions, 153 deletions

diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 404bc52b7806..617efa12a3a5 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -31,18 +31,18 @@
 
 #if defined(DEBUG)
 #define DBG udbg_printf
+#define FAIL udbg_printf
 #else
-#define DBG pr_debug
+#define DBG pr_devel
+#define FAIL pr_debug
 #endif
 
 /**
  * struct ps3_bmp - a per cpu irq status and mask bitmap structure
  * @status: 256 bit status bitmap indexed by plug
- * @unused_1:
+ * @unused_1: Alignment
  * @mask: 256 bit mask bitmap indexed by plug
- * @unused_2:
- * @lock:
- * @ipi_debug_brk_mask:
+ * @unused_2: Alignment
  *
  * The HV maintains per SMT thread mappings of HV outlet to HV plug on
  * behalf of the guest.  These mappings are implemented as 256 bit guest
@@ -73,21 +73,25 @@ struct ps3_bmp {
                 unsigned long mask;
                 u64 unused_2[3];
         };
-        u64 ipi_debug_brk_mask;
-        spinlock_t lock;
 };
 
 /**
  * struct ps3_private - a per cpu data structure
  * @bmp: ps3_bmp structure
+ * @bmp_lock: Syncronize access to bmp.
+ * @ipi_debug_brk_mask: Mask for debug break IPIs
  * @ppe_id: HV logical_ppe_id
  * @thread_id: HV thread_id
+ * @ipi_mask: Mask of IPI virqs
  */
 
 struct ps3_private {
         struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));
+        spinlock_t bmp_lock;
         u64 ppe_id;
         u64 thread_id;
+        unsigned long ipi_debug_brk_mask;
+        unsigned long ipi_mask;
 };
 
 static DEFINE_PER_CPU(struct ps3_private, ps3_private);
@@ -104,7 +108,7 @@ static void ps3_chip_mask(struct irq_data *d)
         struct ps3_private *pd = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
-        pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
+        DBG("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
                 pd->thread_id, d->irq);
 
         local_irq_save(flags);
@@ -125,7 +129,7 @@ static void ps3_chip_unmask(struct irq_data *d)
         struct ps3_private *pd = irq_data_get_irq_chip_data(d);
         unsigned long flags;
 
-        pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
+        DBG("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,
                 pd->thread_id, d->irq);
 
         local_irq_save(flags);
@@ -144,7 +148,11 @@ static void ps3_chip_unmask(struct irq_data *d)
 static void ps3_chip_eoi(struct irq_data *d)
 {
         const struct ps3_private *pd = irq_data_get_irq_chip_data(d);
-        lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, d->irq);
+
+        /* non-IPIs are EOIed here. */
+
+        if (!test_bit(63 - d->irq, &pd->ipi_mask))
+                lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, d->irq);
 }
 
 /**
@@ -185,19 +193,19 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
         *virq = irq_create_mapping(NULL, outlet);
 
         if (*virq == NO_IRQ) {
-                pr_debug("%s:%d: irq_create_mapping failed: outlet %lu\n",
+                FAIL("%s:%d: irq_create_mapping failed: outlet %lu\n",
                         __func__, __LINE__, outlet);
                 result = -ENOMEM;
                 goto fail_create;
         }
 
-        pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
+        DBG("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
                 outlet, cpu, *virq);
 
         result = irq_set_chip_data(*virq, pd);
 
         if (result) {
-                pr_debug("%s:%d: irq_set_chip_data failed\n",
+                FAIL("%s:%d: irq_set_chip_data failed\n",
                         __func__, __LINE__);
                 goto fail_set;
         }
@@ -223,13 +231,13 @@ static int ps3_virq_destroy(unsigned int virq)
 {
         const struct ps3_private *pd = irq_get_chip_data(virq);
 
-        pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
+        DBG("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
         irq_set_chip_data(virq, NULL);
         irq_dispose_mapping(virq);
 
-        pr_debug("%s:%d <-\n", __func__, __LINE__);
+        DBG("%s:%d <-\n", __func__, __LINE__);
         return 0;
 }
 
@@ -252,7 +260,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
         result = ps3_virq_setup(cpu, outlet, virq);
 
         if (result) {
-                pr_debug("%s:%d: ps3_virq_setup failed\n", __func__, __LINE__);
+                FAIL("%s:%d: ps3_virq_setup failed\n", __func__, __LINE__);
                 goto fail_setup;
         }
 
@@ -264,7 +272,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
                 outlet, 0);
 
         if (result) {
-                pr_info("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",
+                FAIL("%s:%d: lv1_connect_irq_plug_ext failed: %s\n",
                 __func__, __LINE__, ps3_result(result));
                 result = -EPERM;
                 goto fail_connect;
@@ -293,7 +301,7 @@ int ps3_irq_plug_destroy(unsigned int virq)
         int result;
         const struct ps3_private *pd = irq_get_chip_data(virq);
 
-        pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
+        DBG("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
         ps3_chip_mask(irq_get_irq_data(virq));
@@ -301,7 +309,7 @@ int ps3_irq_plug_destroy(unsigned int virq)
         result = lv1_disconnect_irq_plug_ext(pd->ppe_id, pd->thread_id, virq);
 
         if (result)
-                pr_info("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",
+                FAIL("%s:%d: lv1_disconnect_irq_plug_ext failed: %s\n",
                 __func__, __LINE__, ps3_result(result));
 
         ps3_virq_destroy(virq);
@@ -329,7 +337,7 @@ int ps3_event_receive_port_setup(enum ps3_cpu_binding cpu, unsigned int *virq)
         result = lv1_construct_event_receive_port(&outlet);
 
         if (result) {
-                pr_debug("%s:%d: lv1_construct_event_receive_port failed: %s\n",
+                FAIL("%s:%d: lv1_construct_event_receive_port failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 *virq = NO_IRQ;
                 return result;
@@ -355,14 +363,14 @@ int ps3_event_receive_port_destroy(unsigned int virq)
 {
         int result;
 
-        pr_debug(" -> %s:%d virq %u\n", __func__, __LINE__, virq);
+        DBG(" -> %s:%d virq %u\n", __func__, __LINE__, virq);
 
         ps3_chip_mask(irq_get_irq_data(virq));
 
         result = lv1_destruct_event_receive_port(virq_to_hw(virq));
 
         if (result)
-                pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
+                FAIL("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
 
         /*
@@ -370,7 +378,7 @@ int ps3_event_receive_port_destroy(unsigned int virq)
          * calls from interrupt context (smp_call_function) when kexecing.
          */
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        DBG(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
@@ -406,7 +414,7 @@ int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,
                 dev->dev_id, virq_to_hw(*virq), dev->interrupt_id);
 
         if (result) {
-                pr_debug("%s:%d: lv1_connect_interrupt_event_receive_port"
+                FAIL("%s:%d: lv1_connect_interrupt_event_receive_port"
                         " failed: %s\n", __func__, __LINE__,
                         ps3_result(result));
                 ps3_event_receive_port_destroy(*virq);
@@ -414,7 +422,7 @@ int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,
                 return result;
         }
 
-        pr_debug("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
+        DBG("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
                 dev->interrupt_id, *virq);
 
         return 0;
@@ -428,14 +436,14 @@ int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,
 
         int result;
 
-        pr_debug(" -> %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
+        DBG(" -> %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,
                 dev->interrupt_id, virq);
 
         result = lv1_disconnect_interrupt_event_receive_port(dev->bus_id,
                 dev->dev_id, virq_to_hw(virq), dev->interrupt_id);
 
         if (result)
-                pr_debug("%s:%d: lv1_disconnect_interrupt_event_receive_port"
+                FAIL("%s:%d: lv1_disconnect_interrupt_event_receive_port"
                         " failed: %s\n", __func__, __LINE__,
                         ps3_result(result));
 
@@ -450,7 +458,7 @@ int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,
         result = ps3_virq_destroy(virq);
         BUG_ON(result);
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        DBG(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 EXPORT_SYMBOL(ps3_sb_event_receive_port_destroy);
@@ -475,7 +483,7 @@ int ps3_io_irq_setup(enum ps3_cpu_binding cpu, unsigned int interrupt_id,
         result = lv1_construct_io_irq_outlet(interrupt_id, &outlet);
 
         if (result) {
-                pr_debug("%s:%d: lv1_construct_io_irq_outlet failed: %s\n",
+                FAIL("%s:%d: lv1_construct_io_irq_outlet failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 return result;
         }
@@ -505,7 +513,7 @@ int ps3_io_irq_destroy(unsigned int virq)
         result = lv1_destruct_io_irq_outlet(outlet);
 
         if (result)
-                pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
+                FAIL("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
 
         return result;
@@ -537,7 +545,7 @@ int ps3_vuart_irq_setup(enum ps3_cpu_binding cpu, void* virt_addr_bmp,
         result = lv1_configure_virtual_uart_irq(lpar_addr, &outlet);
 
         if (result) {
-                pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
+                FAIL("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 return result;
         }
@@ -557,7 +565,7 @@ int ps3_vuart_irq_destroy(unsigned int virq)
         result = lv1_deconfigure_virtual_uart_irq();
 
         if (result) {
-                pr_debug("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
+                FAIL("%s:%d: lv1_configure_virtual_uart_irq failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 return result;
         }
@@ -590,7 +598,7 @@ int ps3_spe_irq_setup(enum ps3_cpu_binding cpu, unsigned long spe_id,
         result = lv1_get_spe_irq_outlet(spe_id, class, &outlet);
 
         if (result) {
-                pr_debug("%s:%d: lv1_get_spe_irq_outlet failed: %s\n",
+                FAIL("%s:%d: lv1_get_spe_irq_outlet failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 return result;
         }
@@ -621,7 +629,7 @@ int ps3_spe_irq_destroy(unsigned int virq)
 static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,
         const char* func, int line)
 {
-        pr_debug("%s:%d: %s %u {%04lx_%04lx_%04lx_%04lx}\n",
+        pr_debug("%s:%d: %s %u {%04llx_%04llx_%04llx_%04llx}\n",
                 func, line, header, cpu,
                 *p >> 48, (*p >> 32) & 0xffff, (*p >> 16) & 0xffff,
                 *p & 0xffff);
@@ -630,7 +638,7 @@ static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu,
 static void __maybe_unused _dump_256_bmp(const char *header,
         const u64 *p, unsigned cpu, const char* func, int line)
 {
-        pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n",
+        pr_debug("%s:%d: %s %u {%016llx:%016llx:%016llx:%016llx}\n",
                 func, line, header, cpu, p[0], p[1], p[2], p[3]);
 }
 
@@ -639,10 +647,10 @@ static void _dump_bmp(struct ps3_private* pd, const char* func, int line)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&pd->bmp.lock, flags);
+        spin_lock_irqsave(&pd->bmp_lock, flags);
         _dump_64_bmp("stat", &pd->bmp.status, pd->thread_id, func, line);
-        _dump_64_bmp("mask", &pd->bmp.mask, pd->thread_id, func, line);
-        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+        _dump_64_bmp("mask", (u64*)&pd->bmp.mask, pd->thread_id, func, line);
+        spin_unlock_irqrestore(&pd->bmp_lock, flags);
 }
 
 #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__)
@@ -651,9 +659,9 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd,
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&pd->bmp.lock, flags);
-        _dump_64_bmp("mask", &pd->bmp.mask, pd->thread_id, func, line);
-        spin_unlock_irqrestore(&pd->bmp.lock, flags);
+        spin_lock_irqsave(&pd->bmp_lock, flags);
+        _dump_64_bmp("mask", (u64*)&pd->bmp.mask, pd->thread_id, func, line);
+        spin_unlock_irqrestore(&pd->bmp_lock, flags);
 }
 #else
 static void dump_bmp(struct ps3_private* pd) {};
@@ -662,7 +670,7 @@ static void dump_bmp(struct ps3_private* pd) {};
 static int ps3_host_map(struct irq_host *h, unsigned int virq,
         irq_hw_number_t hwirq)
 {
-        pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
+        DBG("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
                 virq);
 
         irq_set_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
@@ -685,10 +693,20 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
 {
         struct ps3_private *pd = &per_cpu(ps3_private, cpu);
 
-        pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq;
+        set_bit(63 - virq, &pd->ipi_debug_brk_mask);
 
-        pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__,
-                cpu, virq, pd->bmp.ipi_debug_brk_mask);
+        DBG("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__,
+                cpu, virq, pd->ipi_debug_brk_mask);
+}
+
+void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq)
+{
+        struct ps3_private *pd = &per_cpu(ps3_private, cpu);
+
+        set_bit(63 - virq, &pd->ipi_mask);
+
+        DBG("%s:%d: cpu %u, virq %u, ipi_mask %lxh\n", __func__, __LINE__,
+                cpu, virq, pd->ipi_mask);
 }
 
 static unsigned int ps3_get_irq(void)
@@ -699,14 +717,14 @@ static unsigned int ps3_get_irq(void)
 
         /* check for ipi break first to stop this cpu ASAP */
 
-        if (x & pd->bmp.ipi_debug_brk_mask)
-                x &= pd->bmp.ipi_debug_brk_mask;
+        if (x & pd->ipi_debug_brk_mask)
+                x &= pd->ipi_debug_brk_mask;
 
         asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
         plug &= 0x3f;
 
         if (unlikely(plug == NO_IRQ)) {
-                pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__,
+                DBG("%s:%d: no plug found: thread_id %llu\n", __func__,
                         __LINE__, pd->thread_id);
                 dump_bmp(&per_cpu(ps3_private, 0));
                 dump_bmp(&per_cpu(ps3_private, 1));
@@ -720,6 +738,12 @@ static unsigned int ps3_get_irq(void)
                 BUG();
         }
 #endif
+
+        /* IPIs are EOIed here. */
+
+        if (test_bit(63 - plug, &pd->ipi_mask))
+                lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, plug);
+
         return plug;
 }
 
@@ -739,9 +763,9 @@ void __init ps3_init_IRQ(void)
 
                 lv1_get_logical_ppe_id(&pd->ppe_id);
                 pd->thread_id = get_hard_smp_processor_id(cpu);
-                spin_lock_init(&pd->bmp.lock);
+                spin_lock_init(&pd->bmp_lock);
 
-                pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",
+                DBG("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",
                         __func__, __LINE__, pd->ppe_id, pd->thread_id,
                         ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
 
@@ -749,7 +773,7 @@ void __init ps3_init_IRQ(void)
                         pd->thread_id, ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
 
                 if (result)
-                        pr_debug("%s:%d: lv1_configure_irq_state_bitmap failed:"
+                        FAIL("%s:%d: lv1_configure_irq_state_bitmap failed:"
                                 " %s\n", __func__, __LINE__,
                                 ps3_result(result));
         }
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 72714ad27842..8bd6ba542691 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -319,7 +319,6 @@ static int __init ps3_mm_add_memory(void)
         }
 
         memblock_add(start_addr, map.r1.size);
-        memblock_analyze();
 
         result = online_pages(start_pfn, nr_pages);
 
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 9a196a88eda7..1a633ed0fe98 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -43,6 +43,7 @@ void ps3_mm_shutdown(void);
 void ps3_init_IRQ(void);
 void ps3_shutdown_IRQ(int cpu);
 void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
+void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq);
 
 /* smp */
 
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index ca40f6afd35d..7bdfea336f5e 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -44,7 +44,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line)
                 s[i] = (in[i] <= 126 && in[i] >= 32) ? in[i] : '.';
         s[i] = 0;
 
-        pr_debug("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s);
+        pr_devel("%s:%d: %s%016llx : %s\n", func, line, hdr, n, s);
 #endif
 }
 
@@ -53,7 +53,7 @@ static void _dump_field(const char *hdr, u64 n, const char *func, int line)
 static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
         u64 n4, const char *func, int line)
 {
-        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
+        pr_devel("%s:%d: lpar: %u\n", func, line, lpar_id);
         _dump_field("n1: ", n1, func, line);
         _dump_field("n2: ", n2, func, line);
         _dump_field("n3: ", n3, func, line);
@@ -65,13 +65,13 @@ static void _dump_node_name(unsigned int lpar_id, u64 n1, u64 n2, u64 n3,
 static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
         u64 v1, u64 v2, const char *func, int line)
 {
-        pr_debug("%s:%d: lpar: %u\n", func, line, lpar_id);
+        pr_devel("%s:%d: lpar: %u\n", func, line, lpar_id);
         _dump_field("n1: ", n1, func, line);
         _dump_field("n2: ", n2, func, line);
         _dump_field("n3: ", n3, func, line);
         _dump_field("n4: ", n4, func, line);
-        pr_debug("%s:%d: v1: %016llx\n", func, line, v1);
-        pr_debug("%s:%d: v2: %016llx\n", func, line, v2);
+        pr_devel("%s:%d: v1: %016llx\n", func, line, v1);
+        pr_devel("%s:%d: v2: %016llx\n", func, line, v2);
 }
 
 /**
@@ -131,11 +131,11 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
                 lpar_id = id;
         }
 
-        result = lv1_get_repository_node_value(lpar_id, n1, n2, n3, n4, &v1,
+        result = lv1_read_repository_node(lpar_id, n1, n2, n3, n4, &v1,
                 &v2);
 
         if (result) {
-                pr_debug("%s:%d: lv1_get_repository_node_value failed: %s\n",
+                pr_warn("%s:%d: lv1_read_repository_node failed: %s\n",
                         __func__, __LINE__, ps3_result(result));
                 dump_node_name(lpar_id, n1, n2, n3, n4);
                 return -ENOENT;
@@ -149,10 +149,10 @@ static int read_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4,
                 *_v2 = v2;
 
         if (v1 && !_v1)
-                pr_debug("%s:%d: warning: discarding non-zero v1: %016llx\n",
+                pr_devel("%s:%d: warning: discarding non-zero v1: %016llx\n",
                         __func__, __LINE__, v1);
         if (v2 && !_v2)
-                pr_debug("%s:%d: warning: discarding non-zero v2: %016llx\n",
+                pr_devel("%s:%d: warning: discarding non-zero v2: %016llx\n",
                         __func__, __LINE__, v2);
 
         return 0;
@@ -323,16 +323,16 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
         result = ps3_repository_read_bus_num_dev(tmp.bus_index, &num_dev);
 
         if (result) {
-                pr_debug("%s:%d read_bus_num_dev failed\n", __func__, __LINE__);
+                pr_devel("%s:%d read_bus_num_dev failed\n", __func__, __LINE__);
                 return result;
         }
 
-        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n",
+        pr_devel("%s:%d: bus_type %u, bus_index %u, bus_id %llu, num_dev %u\n",
                 __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
                 num_dev);
 
         if (tmp.dev_index >= num_dev) {
-                pr_debug("%s:%d: no device found\n", __func__, __LINE__);
+                pr_devel("%s:%d: no device found\n", __func__, __LINE__);
                 return -ENODEV;
         }
 
@@ -340,7 +340,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 &tmp.dev_type);
 
         if (result) {
-                pr_debug("%s:%d read_dev_type failed\n", __func__, __LINE__);
+                pr_devel("%s:%d read_dev_type failed\n", __func__, __LINE__);
                 return result;
         }
 
@@ -348,12 +348,12 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 &tmp.dev_id);
 
         if (result) {
-                pr_debug("%s:%d ps3_repository_read_dev_id failed\n", __func__,
+                pr_devel("%s:%d ps3_repository_read_dev_id failed\n", __func__,
                 __LINE__);
                 return result;
         }
 
-        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n",
+        pr_devel("%s:%d: found: dev_type %u, dev_index %u, dev_id %llu\n",
                 __func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id);
 
         *repo = tmp;
@@ -367,14 +367,14 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,
         struct ps3_repository_device tmp;
         unsigned int num_dev;
 
-        pr_debug(" -> %s:%u: find device by id %llu:%llu\n", __func__, __LINE__,
+        pr_devel(" -> %s:%u: find device by id %llu:%llu\n", __func__, __LINE__,
                  bus_id, dev_id);
 
         for (tmp.bus_index = 0; tmp.bus_index < 10; tmp.bus_index++) {
                 result = ps3_repository_read_bus_id(tmp.bus_index,
                                                     &tmp.bus_id);
                 if (result) {
-                        pr_debug("%s:%u read_bus_id(%u) failed\n", __func__,
+                        pr_devel("%s:%u read_bus_id(%u) failed\n", __func__,
                                  __LINE__, tmp.bus_index);
                         return result;
                 }
@@ -382,23 +382,23 @@ int ps3_repository_find_device_by_id(struct ps3_repository_device *repo,
                 if (tmp.bus_id == bus_id)
                         goto found_bus;
 
-                pr_debug("%s:%u: skip, bus_id %llu\n", __func__, __LINE__,
+                pr_devel("%s:%u: skip, bus_id %llu\n", __func__, __LINE__,
                          tmp.bus_id);
         }
-        pr_debug(" <- %s:%u: bus not found\n", __func__, __LINE__);
+        pr_devel(" <- %s:%u: bus not found\n", __func__, __LINE__);
         return result;
 
 found_bus:
         result = ps3_repository_read_bus_type(tmp.bus_index, &tmp.bus_type);
         if (result) {
-                pr_debug("%s:%u read_bus_type(%u) failed\n", __func__,
+                pr_devel("%s:%u read_bus_type(%u) failed\n", __func__,
                          __LINE__, tmp.bus_index);
                 return result;
         }
 
         result = ps3_repository_read_bus_num_dev(tmp.bus_index, &num_dev);
         if (result) {
-                pr_debug("%s:%u read_bus_num_dev failed\n", __func__,
+                pr_devel("%s:%u read_bus_num_dev failed\n", __func__,
                          __LINE__);
                 return result;
         }
@@ -408,7 +408,7 @@ found_bus:
                                                     tmp.dev_index,
                                                     &tmp.dev_id);
                 if (result) {
-                        pr_debug("%s:%u read_dev_id(%u:%u) failed\n", __func__,
+                        pr_devel("%s:%u read_dev_id(%u:%u) failed\n", __func__,
                                  __LINE__, tmp.bus_index, tmp.dev_index);
                         return result;
                 }
@@ -416,21 +416,21 @@ found_bus:
                 if (tmp.dev_id == dev_id)
                         goto found_dev;
 
-                pr_debug("%s:%u: skip, dev_id %llu\n", __func__, __LINE__,
+                pr_devel("%s:%u: skip, dev_id %llu\n", __func__, __LINE__,
                          tmp.dev_id);
         }
-        pr_debug(" <- %s:%u: dev not found\n", __func__, __LINE__);
+        pr_devel(" <- %s:%u: dev not found\n", __func__, __LINE__);
         return result;
 
 found_dev:
         result = ps3_repository_read_dev_type(tmp.bus_index, tmp.dev_index,
                                               &tmp.dev_type);
         if (result) {
-                pr_debug("%s:%u read_dev_type failed\n", __func__, __LINE__);
+                pr_devel("%s:%u read_dev_type failed\n", __func__, __LINE__);
                 return result;
         }
 
-        pr_debug(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n",
+        pr_devel(" <- %s:%u: found: type (%u:%u) index (%u:%u) id (%llu:%llu)\n",
                  __func__, __LINE__, tmp.bus_type, tmp.dev_type, tmp.bus_index,
                  tmp.dev_index, tmp.bus_id, tmp.dev_id);
         *repo = tmp;
@@ -443,18 +443,18 @@ int __devinit ps3_repository_find_devices(enum ps3_bus_type bus_type,
         int result = 0;
         struct ps3_repository_device repo;
 
-        pr_debug(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
+        pr_devel(" -> %s:%d: find bus_type %u\n", __func__, __LINE__, bus_type);
 
         repo.bus_type = bus_type;
         result = ps3_repository_find_bus(repo.bus_type, 0, &repo.bus_index);
         if (result) {
-                pr_debug(" <- %s:%u: bus not found\n", __func__, __LINE__);
+                pr_devel(" <- %s:%u: bus not found\n", __func__, __LINE__);
                 return result;
         }
 
         result = ps3_repository_read_bus_id(repo.bus_index, &repo.bus_id);
         if (result) {
-                pr_debug("%s:%d read_bus_id(%u) failed\n", __func__, __LINE__,
+                pr_devel("%s:%d read_bus_id(%u) failed\n", __func__, __LINE__,
                          repo.bus_index);
                 return result;
         }
@@ -469,13 +469,13 @@ int __devinit ps3_repository_find_devices(enum ps3_bus_type bus_type,
 
                 result = callback(&repo);
                 if (result) {
-                        pr_debug("%s:%d: abort at callback\n", __func__,
+                        pr_devel("%s:%d: abort at callback\n", __func__,
                                 __LINE__);
                         break;
                 }
         }
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        pr_devel(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
@@ -489,7 +489,7 @@ int ps3_repository_find_bus(enum ps3_bus_type bus_type, unsigned int from,
         for (i = from; i < 10; i++) {
                 error = ps3_repository_read_bus_type(i, &type);
                 if (error) {
-                        pr_debug("%s:%d read_bus_type failed\n",
+                        pr_devel("%s:%d read_bus_type failed\n",
                                 __func__, __LINE__);
                         *bus_index = UINT_MAX;
                         return error;
@@ -509,7 +509,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,
         int result = 0;
         unsigned int res_index;
 
-        pr_debug("%s:%d: find intr_type %u\n", __func__, __LINE__, intr_type);
+        pr_devel("%s:%d: find intr_type %u\n", __func__, __LINE__, intr_type);
 
         *interrupt_id = UINT_MAX;
 
@@ -521,7 +521,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,
                         repo->dev_index, res_index, &t, &id);
 
                 if (result) {
-                        pr_debug("%s:%d read_dev_intr failed\n",
+                        pr_devel("%s:%d read_dev_intr failed\n",
                                 __func__, __LINE__);
                         return result;
                 }
@@ -535,7 +535,7 @@ int ps3_repository_find_interrupt(const struct ps3_repository_device *repo,
         if (res_index == 10)
                 return -ENODEV;
 
-        pr_debug("%s:%d: found intr_type %u at res_index %u\n",
+        pr_devel("%s:%d: found intr_type %u at res_index %u\n",
                 __func__, __LINE__, intr_type, res_index);
 
         return result;
@@ -547,7 +547,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,
         int result = 0;
         unsigned int res_index;
 
-        pr_debug("%s:%d: find reg_type %u\n", __func__, __LINE__, reg_type);
+        pr_devel("%s:%d: find reg_type %u\n", __func__, __LINE__, reg_type);
 
         *bus_addr = *len = 0;
 
@@ -560,7 +560,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,
                         repo->dev_index, res_index, &t, &a, &l);
 
                 if (result) {
-                        pr_debug("%s:%d read_dev_reg failed\n",
+                        pr_devel("%s:%d read_dev_reg failed\n",
                                 __func__, __LINE__);
                         return result;
                 }
@@ -575,7 +575,7 @@ int ps3_repository_find_reg(const struct ps3_repository_device *repo,
         if (res_index == 10)
                 return -ENODEV;
 
-        pr_debug("%s:%d: found reg_type %u at res_index %u\n",
+        pr_devel("%s:%d: found reg_type %u at res_index %u\n",
                 __func__, __LINE__, reg_type, res_index);
 
         return result;
@@ -1009,7 +1009,7 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
         int result = 0;
         unsigned int res_index;
 
-        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+        pr_devel(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
                 repo->bus_index, repo->dev_index);
 
         for (res_index = 0; res_index < 10; res_index++) {
@@ -1021,13 +1021,13 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
 
                 if (result) {
                         if (result !=  LV1_NO_ENTRY)
-                                pr_debug("%s:%d ps3_repository_read_dev_intr"
+                                pr_devel("%s:%d ps3_repository_read_dev_intr"
                                         " (%u:%u) failed\n", __func__, __LINE__,
                                         repo->bus_index, repo->dev_index);
                         break;
                 }
 
-                pr_debug("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",
+                pr_devel("%s:%d (%u:%u) intr_type %u, interrupt_id %u\n",
                         __func__, __LINE__, repo->bus_index, repo->dev_index,
                         intr_type, interrupt_id);
         }
@@ -1042,18 +1042,18 @@ int ps3_repository_dump_resource_info(const struct ps3_repository_device *repo)
 
                 if (result) {
                         if (result !=  LV1_NO_ENTRY)
-                                pr_debug("%s:%d ps3_repository_read_dev_reg"
+                                pr_devel("%s:%d ps3_repository_read_dev_reg"
                                         " (%u:%u) failed\n", __func__, __LINE__,
                                         repo->bus_index, repo->dev_index);
                         break;
                 }
 
-                pr_debug("%s:%d (%u:%u) reg_type %u, bus_addr %lxh, len %lxh\n",
+                pr_devel("%s:%d (%u:%u) reg_type %u, bus_addr %llxh, len %llxh\n",
                         __func__, __LINE__, repo->bus_index, repo->dev_index,
                         reg_type, bus_addr, len);
         }
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        pr_devel(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
@@ -1063,22 +1063,22 @@ static int dump_stor_dev_info(struct ps3_repository_device *repo)
         unsigned int num_regions, region_index;
         u64 port, blk_size, num_blocks;
 
-        pr_debug(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
+        pr_devel(" -> %s:%d: (%u:%u)\n", __func__, __LINE__,
                 repo->bus_index, repo->dev_index);
 
         result = ps3_repository_read_stor_dev_info(repo->bus_index,
                 repo->dev_index, &port, &blk_size, &num_blocks, &num_regions);
         if (result) {
-                pr_debug("%s:%d ps3_repository_read_stor_dev_info"
+                pr_devel("%s:%d ps3_repository_read_stor_dev_info"
                         " (%u:%u) failed\n", __func__, __LINE__,
                         repo->bus_index, repo->dev_index);
                 goto out;
         }
 
-        pr_debug("%s:%d  (%u:%u): port %lu, blk_size %lu, num_blocks "
-                 "%lu, num_regions %u\n",
-                 __func__, __LINE__, repo->bus_index, repo->dev_index, port,
-                 blk_size, num_blocks, num_regions);
+        pr_devel("%s:%d  (%u:%u): port %llu, blk_size %llu, num_blocks "
+                 "%llu, num_regions %u\n",
+                 __func__, __LINE__, repo->bus_index, repo->dev_index,
+                port, blk_size, num_blocks, num_regions);
 
         for (region_index = 0; region_index < num_regions; region_index++) {
                 unsigned int region_id;
@@ -1088,19 +1088,20 @@ static int dump_stor_dev_info(struct ps3_repository_device *repo)
                         repo->dev_index, region_index, &region_id,
                         &region_start, &region_size);
                 if (result) {
-                         pr_debug("%s:%d ps3_repository_read_stor_dev_region"
+                         pr_devel("%s:%d ps3_repository_read_stor_dev_region"
                                   " (%u:%u) failed\n", __func__, __LINE__,
                                   repo->bus_index, repo->dev_index);
                         break;
                 }
 
-                pr_debug("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",
+                pr_devel("%s:%d (%u:%u) region_id %u, start %lxh, size %lxh\n",
                         __func__, __LINE__, repo->bus_index, repo->dev_index,
-                        region_id, region_start, region_size);
+                        region_id, (unsigned long)region_start,
+                        (unsigned long)region_size);
         }
 
 out:
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        pr_devel(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
@@ -1109,7 +1110,7 @@ static int dump_device_info(struct ps3_repository_device *repo,
 {
         int result = 0;
 
-        pr_debug(" -> %s:%d: bus_%u\n", __func__, __LINE__, repo->bus_index);
+        pr_devel(" -> %s:%d: bus_%u\n", __func__, __LINE__, repo->bus_index);
 
         for (repo->dev_index = 0; repo->dev_index < num_dev;
                 repo->dev_index++) {
@@ -1118,7 +1119,7 @@ static int dump_device_info(struct ps3_repository_device *repo,
                         repo->dev_index, &repo->dev_type);
 
                 if (result) {
-                        pr_debug("%s:%d ps3_repository_read_dev_type"
+                        pr_devel("%s:%d ps3_repository_read_dev_type"
                                 " (%u:%u) failed\n", __func__, __LINE__,
                                 repo->bus_index, repo->dev_index);
                         break;
@@ -1128,15 +1129,15 @@ static int dump_device_info(struct ps3_repository_device *repo,
                         repo->dev_index, &repo->dev_id);
 
                 if (result) {
-                        pr_debug("%s:%d ps3_repository_read_dev_id"
+                        pr_devel("%s:%d ps3_repository_read_dev_id"
                                 " (%u:%u) failed\n", __func__, __LINE__,
                                 repo->bus_index, repo->dev_index);
                         continue;
                 }
 
-                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %lu\n", __func__,
+                pr_devel("%s:%d  (%u:%u): dev_type %u, dev_id %lu\n", __func__,
                         __LINE__, repo->bus_index, repo->dev_index,
-                        repo->dev_type, repo->dev_id);
+                        repo->dev_type, (unsigned long)repo->dev_id);
 
                 ps3_repository_dump_resource_info(repo);
 
@@ -1144,7 +1145,7 @@ static int dump_device_info(struct ps3_repository_device *repo,
                         dump_stor_dev_info(repo);
         }
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        pr_devel(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
@@ -1153,7 +1154,7 @@ int ps3_repository_dump_bus_info(void)
         int result = 0;
         struct ps3_repository_device repo;
 
-        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+        pr_devel(" -> %s:%d\n", __func__, __LINE__);
 
         memset(&repo, 0, sizeof(repo));
 
@@ -1164,7 +1165,7 @@ int ps3_repository_dump_bus_info(void)
                         &repo.bus_type);
 
                 if (result) {
-                        pr_debug("%s:%d read_bus_type(%u) failed\n",
+                        pr_devel("%s:%d read_bus_type(%u) failed\n",
                                 __func__, __LINE__, repo.bus_index);
                         break;
                 }
@@ -1173,32 +1174,32 @@ int ps3_repository_dump_bus_info(void)
                         &repo.bus_id);
 
                 if (result) {
-                        pr_debug("%s:%d read_bus_id(%u) failed\n",
+                        pr_devel("%s:%d read_bus_id(%u) failed\n",
                                 __func__, __LINE__, repo.bus_index);
                         continue;
                 }
 
                 if (repo.bus_index != repo.bus_id)
-                        pr_debug("%s:%d bus_index != bus_id\n",
+                        pr_devel("%s:%d bus_index != bus_id\n",
                                 __func__, __LINE__);
 
                 result = ps3_repository_read_bus_num_dev(repo.bus_index,
                         &num_dev);
 
                 if (result) {
-                        pr_debug("%s:%d read_bus_num_dev(%u) failed\n",
+                        pr_devel("%s:%d read_bus_num_dev(%u) failed\n",
                                 __func__, __LINE__, repo.bus_index);
                         continue;
                 }
 
-                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %lu, num_dev %u\n",
+                pr_devel("%s:%d bus_%u: bus_type %u, bus_id %lu, num_dev %u\n",
                         __func__, __LINE__, repo.bus_index, repo.bus_type,
-                        repo.bus_id, num_dev);
+                        (unsigned long)repo.bus_id, num_dev);
 
                 dump_device_info(&repo, num_dev);
         }
 
-        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+        pr_devel(" <- %s:%d\n", __func__, __LINE__);
         return result;
 }
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index e8ec1b2bfffd..2d664c5a83b0 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -193,10 +193,12 @@ static int ps3_set_dabr(unsigned long dabr)
 
 static void __init ps3_setup_arch(void)
 {
+        u64 tmp;
 
         DBG(" -> %s:%d\n", __func__, __LINE__);
 
-        lv1_get_version_info(&ps3_firmware_version.raw);
+        lv1_get_version_info(&ps3_firmware_version.raw, &tmp);
+
         printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
                ps3_firmware_version.major, ps3_firmware_version.minor,
                ps3_firmware_version.rev);
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 4c44794faac0..4b35166229fe 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -57,48 +57,51 @@ static void ps3_smp_message_pass(int cpu, int msg)
                         " (%d)\n", __func__, __LINE__, cpu, msg, result);
 }
 
-static int ps3_smp_probe(void)
+static int __init ps3_smp_probe(void)
 {
-        return 2;
-}
+        int cpu;
 
-static void __init ps3_smp_setup_cpu(int cpu)
-{
-        int result;
-        unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
-        int i;
+        for (cpu = 0; cpu < 2; cpu++) {
+                int result;
+                unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
+                int i;
 
-        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
+                DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
 
-        /*
-         * Check assumptions on ps3_ipi_virqs[] indexing. If this
-         * check fails, then a different mapping of PPC_MSG_
-         * to index needs to be setup.
-         */
+                /*
+                * Check assumptions on ps3_ipi_virqs[] indexing. If this
+                * check fails, then a different mapping of PPC_MSG_
+                * to index needs to be setup.
+                */
 
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
-        BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
-        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
+                BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
+                BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
+                BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
+                BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
 
-        for (i = 0; i < MSG_COUNT; i++) {
-                result = ps3_event_receive_port_setup(cpu, &virqs[i]);
+                for (i = 0; i < MSG_COUNT; i++) {
+                        result = ps3_event_receive_port_setup(cpu, &virqs[i]);
 
-                if (result)
-                        continue;
+                        if (result)
+                                continue;
 
-                DBG("%s:%d: (%d, %d) => virq %u\n",
-                        __func__, __LINE__, cpu, i, virqs[i]);
+                        DBG("%s:%d: (%d, %d) => virq %u\n",
+                                __func__, __LINE__, cpu, i, virqs[i]);
 
-                result = smp_request_message_ipi(virqs[i], i);
+                        result = smp_request_message_ipi(virqs[i], i);
 
-                if (result)
-                        virqs[i] = NO_IRQ;
-        }
+                        if (result)
+                                virqs[i] = NO_IRQ;
+                        else
+                                ps3_register_ipi_irq(cpu, virqs[i]);
+                }
 
-        ps3_register_ipi_debug_brk(cpu, virqs[PPC_MSG_DEBUGGER_BREAK]);
+                ps3_register_ipi_debug_brk(cpu, virqs[PPC_MSG_DEBUGGER_BREAK]);
 
-        DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+                DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+        }
+
+        return 2;
 }
 
 void ps3_smp_cleanup_cpu(int cpu)
@@ -121,7 +124,6 @@ static struct smp_ops_t ps3_smp_ops = {
         .probe          = ps3_smp_probe,
         .message_pass   = ps3_smp_message_pass,
         .kick_cpu       = smp_generic_kick_cpu,
-        .setup_cpu      = ps3_smp_setup_cpu,
 };
 
 void smp_init_ps3(void)
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 451fad1c92a8..e17fa1432d80 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -154,7 +154,7 @@ static unsigned long get_vas_id(void)
         u64 id;
 
         lv1_get_logical_ppe_id(&id);
-        lv1_get_virtual_address_space_id_of_ppe(id, &id);
+        lv1_get_virtual_address_space_id_of_ppe(&id);
 
         return id;
 }