[S390] Add topology_core_siblings to topology.h

[linux-2.6] / arch / m68k / kernel / ints.c

diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index b66c97c904b37aba8bd25ca57c5973f65ecd028d..ded7dd2f67b2803688965a49f0abb72faf1e0463 100644 (file)
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -59,14 +59,14 @@ static int m68k_first_user_vec;
 
 static struct irq_controller auto_irq_controller = {
        .name           = "auto",
-       .lock           = SPIN_LOCK_UNLOCKED,
+       .lock           = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
        .startup        = m68k_irq_startup,
        .shutdown       = m68k_irq_shutdown,
 };
 
 static struct irq_controller user_irq_controller = {
        .name           = "user",
-       .lock           = SPIN_LOCK_UNLOCKED,
+       .lock           = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
        .startup        = m68k_irq_startup,
        .shutdown       = m68k_irq_shutdown,
 };
@@ -186,7 +186,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d from %s\n",
-                      __FUNCTION__, irq, node->devname);
+                      __func__, irq, node->devname);
                return -ENXIO;
        }
 
@@ -249,7 +249,7 @@ void free_irq(unsigned int irq, void *dev_id)
        unsigned long flags;
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-               printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+               printk("%s: Incorrect IRQ %d\n", __func__, irq);
                return;
        }
 
@@ -267,7 +267,7 @@ void free_irq(unsigned int irq, void *dev_id)
                node->handler = NULL;
        } else
                printk("%s: Removing probably wrong IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
 
        if (!irq_list[irq]) {
                if (contr->shutdown)
@@ -288,7 +288,7 @@ void enable_irq(unsigned int irq)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
                return;
        }
 
@@ -312,7 +312,7 @@ void disable_irq(unsigned int irq)
 
        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                printk("%s: Incorrect IRQ %d\n",
-                      __FUNCTION__, irq);
+                      __func__, irq);
                return;
        }
 
@@ -326,6 +326,10 @@ void disable_irq(unsigned int irq)
 
 EXPORT_SYMBOL(disable_irq);
 
+void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
+
+EXPORT_SYMBOL(disable_irq_nosync);
+
 int m68k_irq_startup(unsigned int irq)
 {
        if (irq <= IRQ_AUTO_7)