diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-14 01:34:35 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-14 01:34:35 +0200 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /arch/mips/cavium-octeon | |
| parent | of: push struct boot_param_header and defines into powerpc (diff) | |
| parent | of/selftest: add testcase for nodes with same name and address (diff) | |
| download | linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.xz linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.zip | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'arch/mips/cavium-octeon')
| -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, |