diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:53:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:53:05 +0100 |
| commit | 3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch) | |
| tree | 5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /arch/cris/arch-v32/kernel/irq.c | |
| parent | kmemtrace: Remove the relay version of kmemtrace (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
| download | linux-dev-3d7a96f5a485b7d06c2379f343d7312af89ec9e2.tar.xz linux-dev-3d7a96f5a485b7d06c2379f343d7312af89ec9e2.zip | |
Merge branch 'linus' into tracing/kmemtrace2
Diffstat (limited to 'arch/cris/arch-v32/kernel/irq.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index 173c141ac9ba..295131fee710 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c @@ -325,11 +325,11 @@ static void end_crisv32_irq(unsigned int irq) { } -void set_affinity_crisv32_irq(unsigned int irq, cpumask_t dest) +void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) { unsigned long flags; spin_lock_irqsave(&irq_lock, flags); - irq_allocations[irq - FIRST_IRQ].mask = dest; + irq_allocations[irq - FIRST_IRQ].mask = *dest; spin_unlock_irqrestore(&irq_lock, flags); } |