[MIPS] BCM1480: Export zbbus_mhz.

[linux-2.6-omap-h63xx.git] / arch / mips / sibyte / bcm1480 / irq.c

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 2e8f6b2e2420e8c7eb485ec575b7f14bf085d77c..e729b5f302643467162a8abb63f79868f66f506d 100644 (file)
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,13 +76,13 @@ __setup("nokgdb", nokgdb);
 
 /* Default to UART1 */
 int kgdb_port = 1;
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
 extern char sb1250_duart_present[];
 #endif
 #endif
 
 static struct irq_chip bcm1480_irq_type = {
-       .typename = "BCM1480-IMR",
+       .name = "BCM1480-IMR",
        .ack = ack_bcm1480_irq,
        .mask = disable_bcm1480_irq,
        .mask_ack = ack_bcm1480_irq,
@@ -100,8 +100,8 @@ DEFINE_SPINLOCK(bcm1480_imr_lock);
 
 void bcm1480_mask_irq(int cpu, int irq)
 {
-       unsigned long flags;
-       u64 cur_ints,hl_spacing;
+       unsigned long flags, hl_spacing;
+       u64 cur_ints;
 
        spin_lock_irqsave(&bcm1480_imr_lock, flags);
        hl_spacing = 0;
@@ -117,8 +117,8 @@ void bcm1480_mask_irq(int cpu, int irq)
 
 void bcm1480_unmask_irq(int cpu, int irq)
 {
-       unsigned long flags;
-       u64 cur_ints,hl_spacing;
+       unsigned long flags, hl_spacing;
+       u64 cur_ints;
 
        spin_lock_irqsave(&bcm1480_imr_lock, flags);
        hl_spacing = 0;
@@ -141,11 +141,11 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)
        unsigned long flags;
        unsigned int irq_dirty;
 
-       i = first_cpu(mask);
-       if (next_cpu(i, mask) <= NR_CPUS) {
+       if (cpus_weight(mask) != 1) {
                printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
                return;
        }
+       i = first_cpu(mask);
 
        /* Convert logical CPU to physical CPU */
        cpu = cpu_logical_map(i);
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
        if (kgdb_flag) {
                kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
 
-#ifdef CONFIG_SIBYTE_SB1250_DUART
+#ifdef CONFIG_SERIAL_SB1250_DUART
                sb1250_duart_present[kgdb_port] = 0;
 #endif
                /* Setup uart 1 settings, mapper */
@@ -420,7 +420,7 @@ void __init arch_init_irq(void)
 #ifdef CONFIG_GDB_CONSOLE
                register_gdb_console();
 #endif
-               prom_printf("Waiting for GDB on UART port %d\n", kgdb_port);
+               printk("Waiting for GDB on UART port %d\n", kgdb_port);
                set_debug_traps();
                breakpoint();
        }