diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
| commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
| tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /arch/mips/cavium-octeon/octeon-irq.c | |
| parent | Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xte... (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.xz linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip | |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-irq.c')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 741734049675..2bc4aa95944e 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -809,6 +809,7 @@ static struct irq_chip octeon_irq_chip_ciu_gpio_v2 = { .irq_set_type = octeon_irq_ciu_gpio_set_type, #ifdef CONFIG_SMP .irq_set_affinity = octeon_irq_ciu_set_affinity_v2, + .irq_cpu_offline = octeon_irq_cpu_offline_ciu, #endif .flags = IRQCHIP_SET_TYPE_MASKED, }; @@ -823,6 +824,7 @@ static struct irq_chip octeon_irq_chip_ciu_gpio = { .irq_set_type = octeon_irq_ciu_gpio_set_type, #ifdef CONFIG_SMP .irq_set_affinity = octeon_irq_ciu_set_affinity, + .irq_cpu_offline = octeon_irq_cpu_offline_ciu, #endif .flags = IRQCHIP_SET_TYPE_MASKED, }; |