aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sibyte/sb1250/irq.c
diff options
context:
space:
mode:
authorAndrew Isaacson <adi@broadcom.com>2005-06-22 19:01:09 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:32:32 -0400
commit942d042d17c77febab9af6815b2e77f665d0f9c1 (patch)
tree546feac57c4e16b7c388a1e377e3e4212aee9585 /arch/mips/sibyte/sb1250/irq.c
parentf5cfa980e535e1f77038f8037422594592208695 (diff)
Use cpumask_t rather than hand-rolled bitmask code in sb1250_set_affinity.
Signed-Off-By: Andrew Isaacson <adi@broadcom.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sibyte/sb1250/irq.c')
-rw-r--r--arch/mips/sibyte/sb1250/irq.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index b9f1ff420fef..589537bfcc3d 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -53,7 +53,7 @@ static void disable_sb1250_irq(unsigned int irq);
53static unsigned int startup_sb1250_irq(unsigned int irq); 53static unsigned int startup_sb1250_irq(unsigned int irq);
54static void ack_sb1250_irq(unsigned int irq); 54static void ack_sb1250_irq(unsigned int irq);
55#ifdef CONFIG_SMP 55#ifdef CONFIG_SMP
56static void sb1250_set_affinity(unsigned int irq, unsigned long mask); 56static void sb1250_set_affinity(unsigned int irq, cpumask_t mask);
57#endif 57#endif
58 58
59#ifdef CONFIG_SIBYTE_HAS_LDT 59#ifdef CONFIG_SIBYTE_HAS_LDT
@@ -117,23 +117,16 @@ void sb1250_unmask_irq(int cpu, int irq)
117} 117}
118 118
119#ifdef CONFIG_SMP 119#ifdef CONFIG_SMP
120static void sb1250_set_affinity(unsigned int irq, unsigned long mask) 120static void sb1250_set_affinity(unsigned int irq, cpumask_t mask)
121{ 121{
122 int i = 0, old_cpu, cpu, int_on; 122 int i = 0, old_cpu, cpu, int_on;
123 u64 cur_ints; 123 u64 cur_ints;
124 irq_desc_t *desc = irq_desc + irq; 124 irq_desc_t *desc = irq_desc + irq;
125 unsigned long flags; 125 unsigned long flags;
126 126
127 while (mask) { 127 i = first_cpu(mask);
128 if (mask & 1) {
129 mask >>= 1;
130 break;
131 }
132 mask >>= 1;
133 i++;
134 }
135 128
136 if (mask) { 129 if (cpus_weight(mask) > 1) {
137 printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); 130 printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
138 return; 131 return;
139 } 132 }