diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-15 03:21:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-15 03:21:25 +0400 |
| commit | ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876 (patch) | |
| tree | 47fdb196fc109411d4524bf2c25d88a6d5470477 /arch/powerpc/platforms/wsp/ics.c | |
| parent | 8b36ac50da8e12d0469a7268ddbd6cab29307deb (diff) | |
| parent | 778a785f02ad846446e91dab49331bd7d853c514 (diff) | |
| download | linux-ebf4bcbd5f249afc8f48a7aa32255f8ebbff5876.tar.xz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Quoth BenH:
"Here are a few powerpc fixes for 3.3, all pretty trivial. I also
added the patch to define GET_IP/SET_IP so we can use some more
asm-generic goodness."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries/eeh: Fix crash when error happens during device probe
powerpc/pseries: Fix partition migration hang in stop_topology_update
powerpc/powernv: Disable interrupts while taking phb->lock
powerpc: Fix WARN_ON in decrementer_check_overflow
powerpc/wsp: Fix IRQ affinity setting
powerpc: Implement GET_IP/SET_IP
powerpc/wsp: Permanently enable PCI class code workaround
Diffstat (limited to 'arch/powerpc/platforms/wsp/ics.c')
| -rw-r--r-- | arch/powerpc/platforms/wsp/ics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/wsp/ics.c b/arch/powerpc/platforms/wsp/ics.c index 576874392543..97fe82ee8633 100644 --- a/arch/powerpc/platforms/wsp/ics.c +++ b/arch/powerpc/platforms/wsp/ics.c @@ -346,7 +346,7 @@ static int wsp_chip_set_affinity(struct irq_data *d, * For the moment only implement delivery to all cpus or one cpu. * Get current irq_server for the given irq */ - ret = cache_hwirq_map(ics, d->irq, cpumask); + ret = cache_hwirq_map(ics, hw_irq, cpumask); if (ret == -1) { char cpulist[128]; cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask); |