3 files changed, 13 insertions, 11 deletions

diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig
index 57cc56562567..0b192a1c429d 100644
--- a/arch/powerpc/sysdev/bestcomm/Kconfig
+++ b/arch/powerpc/sysdev/bestcomm/Kconfig
@@ -17,23 +17,20 @@ config PPC_BESTCOMM
           answer Y or M. Otherwise say N.
 
 config PPC_BESTCOMM_ATA
-        tristate "Bestcomm ATA task support"
+        tristate
         depends on PPC_BESTCOMM
-        default n
         help
           This option enables the support for the ATA task.
 
 config PPC_BESTCOMM_FEC
-        tristate "Bestcomm FEC tasks support"
+        tristate
         depends on PPC_BESTCOMM
-        default n
         help
           This option enables the support for the FEC tasks.
 
 config PPC_BESTCOMM_GEN_BD
-        tristate "Bestcomm GenBD tasks support"
+        tristate
         depends on PPC_BESTCOMM
-        default n
         help
           This option enables the support for the GenBD tasks.
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f6299cca7814..1890fb085cde 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -600,7 +600,7 @@ static int irq_choose_cpu(unsigned int virt_irq)
                 cpuid = first_cpu(tmp);
         }
 
-        return cpuid;
+        return get_hard_smp_processor_id(cpuid);
 }
 #else
 static int irq_choose_cpu(unsigned int virt_irq)
@@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count)
 void __init mpic_init(struct mpic *mpic)
 {
         int i;
+        int cpu;
 
         BUG_ON(mpic->num_sources == 0);
 
@@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic)
 
         mpic_pasemi_msi_init(mpic);
 
+        if (mpic->flags & MPIC_PRIMARY)
+                cpu = hard_smp_processor_id();
+        else
+                cpu = 0;
+
         for (i = 0; i < mpic->num_sources; i++) {
                 /* start with vector = source number, and masked */
                 u32 vecpri = MPIC_VECPRI_MASK | i |
@@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic)
                         continue;
                 /* init hw */
                 mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
-                mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION),
-                               1 << hard_smp_processor_id());
+                mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
         }
         
         /* Init spurious vector */
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index b7aefd0d45cb..a22e1a2df1af 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -107,8 +107,8 @@ xilinx_intc_init(struct device_node *np)
         }
         regs = ioremap(res.start, 32);
 
-        printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n",
-                res.start, regs);
+        printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n",
+                (unsigned long long) res.start, regs);
 
         /* Setup interrupt controller */
         out_be32(regs + XINTC_IER, 0); /* disable all irqs */