diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:00:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:00:26 -0400 |
commit | d17abcd5417d84cfa8a225160481203a37dc81d4 (patch) | |
tree | 74ce2c425c5c6550acec90bc92c8a3f735f0d257 /arch/sparc/kernel | |
parent | db6f204019380c788f1de06ee937bdbccd60e5c0 (diff) | |
parent | bb75efddeaca89f8a67fd82cdcbaaf436cf17ca9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask:
oprofile: Thou shalt not call __exit functions from __init functions
cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic
cpumask: remove cpumask_t from core
cpumask: convert rcutorture.c
cpumask: use new cpumask_ functions in core code.
cpumask: remove references to struct irqaction's mask field.
cpumask: use mm_cpumask() wrapper: kernel/fork.c
cpumask: use set_cpu_active in init/main.c
cpumask: remove node_to_first_cpu
cpumask: fix seq_bitmap_*() functions.
cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/irq_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c index 44dd5ee64339..ad800b80c718 100644 --- a/arch/sparc/kernel/irq_32.c +++ b/arch/sparc/kernel/irq_32.c | |||
@@ -439,7 +439,6 @@ static int request_fast_irq(unsigned int irq, | |||
439 | flush_cache_all(); | 439 | flush_cache_all(); |
440 | 440 | ||
441 | action->flags = irqflags; | 441 | action->flags = irqflags; |
442 | cpus_clear(action->mask); | ||
443 | action->name = devname; | 442 | action->name = devname; |
444 | action->dev_id = NULL; | 443 | action->dev_id = NULL; |
445 | action->next = NULL; | 444 | action->next = NULL; |
@@ -574,7 +573,6 @@ int request_irq(unsigned int irq, | |||
574 | 573 | ||
575 | action->handler = handler; | 574 | action->handler = handler; |
576 | action->flags = irqflags; | 575 | action->flags = irqflags; |
577 | cpus_clear(action->mask); | ||
578 | action->name = devname; | 576 | action->name = devname; |
579 | action->next = NULL; | 577 | action->next = NULL; |
580 | action->dev_id = dev_id; | 578 | action->dev_id = dev_id; |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index 3369fef5b4b3..ab036a72de5a 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -326,7 +326,6 @@ int sun4d_request_irq(unsigned int irq, | |||
326 | 326 | ||
327 | action->handler = handler; | 327 | action->handler = handler; |
328 | action->flags = irqflags; | 328 | action->flags = irqflags; |
329 | cpus_clear(action->mask); | ||
330 | action->name = devname; | 329 | action->name = devname; |
331 | action->next = NULL; | 330 | action->next = NULL; |
332 | action->dev_id = dev_id; | 331 | action->dev_id = dev_id; |