aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/iosapic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
-rw-r--r--arch/ia64/kernel/iosapic.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index dab4d393908c..7ded76658d2d 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -86,6 +86,7 @@
86#include <linux/kernel.h> 86#include <linux/kernel.h>
87#include <linux/list.h> 87#include <linux/list.h>
88#include <linux/pci.h> 88#include <linux/pci.h>
89#include <linux/slab.h>
89#include <linux/smp.h> 90#include <linux/smp.h>
90#include <linux/string.h> 91#include <linux/string.h>
91#include <linux/bootmem.h> 92#include <linux/bootmem.h>
@@ -793,12 +794,12 @@ iosapic_register_intr (unsigned int gsi,
793 goto unlock_iosapic_lock; 794 goto unlock_iosapic_lock;
794 } 795 }
795 796
796 spin_lock(&irq_desc[irq].lock); 797 raw_spin_lock(&irq_desc[irq].lock);
797 dest = get_target_cpu(gsi, irq); 798 dest = get_target_cpu(gsi, irq);
798 dmode = choose_dmode(); 799 dmode = choose_dmode();
799 err = register_intr(gsi, irq, dmode, polarity, trigger); 800 err = register_intr(gsi, irq, dmode, polarity, trigger);
800 if (err < 0) { 801 if (err < 0) {
801 spin_unlock(&irq_desc[irq].lock); 802 raw_spin_unlock(&irq_desc[irq].lock);
802 irq = err; 803 irq = err;
803 goto unlock_iosapic_lock; 804 goto unlock_iosapic_lock;
804 } 805 }
@@ -817,7 +818,7 @@ iosapic_register_intr (unsigned int gsi,
817 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), 818 (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
818 cpu_logical_id(dest), dest, irq_to_vector(irq)); 819 cpu_logical_id(dest), dest, irq_to_vector(irq));
819 820
820 spin_unlock(&irq_desc[irq].lock); 821 raw_spin_unlock(&irq_desc[irq].lock);
821 unlock_iosapic_lock: 822 unlock_iosapic_lock:
822 spin_unlock_irqrestore(&iosapic_lock, flags); 823 spin_unlock_irqrestore(&iosapic_lock, flags);
823 return irq; 824 return irq;