diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 19:36:49 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 19:36:49 +0200 |
commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /arch/mips/cavium-octeon/octeon-irq.c | |
parent | clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks (diff) | |
parent | cpufreq: exynos: Fix the compile error (diff) | |
download | linux-fced6dee29f6fb143fe16ea90331176ff77e6120.tar.xz linux-fced6dee29f6fb143fe16ea90331176ff77e6120.zip |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-irq.c')
-rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index c2bb4f896ce7..3aa5b46b2d40 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -635,7 +635,7 @@ static void octeon_irq_cpu_offline_ciu(struct irq_data *data) cpumask_clear(&new_affinity); cpumask_set_cpu(cpumask_first(cpu_online_mask), &new_affinity); } - __irq_set_affinity_locked(data, &new_affinity); + irq_set_affinity_locked(data, &new_affinity, false); } static int octeon_irq_ciu_set_affinity(struct irq_data *data, |