diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-27 16:08:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-27 16:08:01 +1000 |
| commit | 9ebe3801f960d59fb6d4e021ca1551c21a24c678 (patch) | |
| tree | a8b469e15bf926f2e69ef5edcd7c7b71487b20ab /arch/cris | |
| parent | 45eaaad1dcb369844e75acc8795d99499e831e55 (diff) | |
| parent | 08461bf8d99ea508e7465fe4b6dd6c249e846ea6 (diff) | |
Merge commit 'genirq/auto-genirq-next'
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/kernel/irq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index df3925cb1c7f..d70b445f4a8f 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c @@ -325,12 +325,14 @@ static void end_crisv32_irq(unsigned int irq) { } -void set_affinity_crisv32_irq(unsigned int irq, const struct cpumask *dest) +int 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; spin_unlock_irqrestore(&irq_lock, flags); + + return 0; } static struct irq_chip crisv32_irq_type = { |