git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
kernel
/
irq
/
migration.c
diff --git
a/kernel/irq/migration.c
b/kernel/irq/migration.c
index
a57ebe9
..
134f9f2
100644
(file)
--- a/
kernel/irq/migration.c
+++ b/
kernel/irq/migration.c
@@
-3,19
+3,19
@@
void set_pending_irq(unsigned int irq, cpumask_t mask)
{
void set_pending_irq(unsigned int irq, cpumask_t mask)
{
-
struct irq_desc
*desc = irq_desc + irq;
+
irq_desc_t
*desc = irq_desc + irq;
unsigned long flags;
spin_lock_irqsave(&desc->lock, flags);
desc->move_irq = 1;
unsigned long flags;
spin_lock_irqsave(&desc->lock, flags);
desc->move_irq = 1;
-
irq_desc[irq].pending_mask
= mask;
+
pending_irq_cpumask[irq]
= mask;
spin_unlock_irqrestore(&desc->lock, flags);
}
void move_native_irq(int irq)
{
spin_unlock_irqrestore(&desc->lock, flags);
}
void move_native_irq(int irq)
{
- struct irq_desc *desc = irq_desc + irq;
cpumask_t tmp;
cpumask_t tmp;
+ irq_desc_t *desc = irq_descp(irq);
if (likely(!desc->move_irq))
return;
if (likely(!desc->move_irq))
return;
@@
-30,15
+30,15
@@
void move_native_irq(int irq)
desc->move_irq = 0;
desc->move_irq = 0;
- if (
unlikely(cpus_empty(irq_desc[irq].pending_mask
)))
+ if (
likely(cpus_empty(pending_irq_cpumask[irq]
)))
return;
return;
- if (!desc->
chip
->set_affinity)
+ if (!desc->
handler
->set_affinity)
return;
assert_spin_locked(&desc->lock);
return;
assert_spin_locked(&desc->lock);
- cpus_and(tmp,
irq_desc[irq].pending_mask
, cpu_online_map);
+ cpus_and(tmp,
pending_irq_cpumask[irq]
, cpu_online_map);
/*
* If there was a valid mask to work with, please
/*
* If there was a valid mask to work with, please
@@
-49,14
+49,14
@@
void move_native_irq(int irq)
* cause some ioapics to mal-function.
* Being paranoid i guess!
*/
* cause some ioapics to mal-function.
* Being paranoid i guess!
*/
- if (likely(!cpus_empty(tmp))) {
+ if (
un
likely(!cpus_empty(tmp))) {
if (likely(!(desc->status & IRQ_DISABLED)))
if (likely(!(desc->status & IRQ_DISABLED)))
- desc->
chip
->disable(irq);
+ desc->
handler
->disable(irq);
- desc->
chip
->set_affinity(irq,tmp);
+ desc->
handler
->set_affinity(irq,tmp);
if (likely(!(desc->status & IRQ_DISABLED)))
if (likely(!(desc->status & IRQ_DISABLED)))
- desc->
chip
->enable(irq);
+ desc->
handler
->enable(irq);
}
}
- cpus_clear(
irq_desc[irq].pending_mask
);
+ cpus_clear(
pending_irq_cpumask[irq]
);
}
}