diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:33:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:33:49 -0700 |
| commit | e80eaf9904d5b19512265e1435372b2e12146a5f (patch) | |
| tree | 23a6428c68ac1035c0985a262aa9ed53d1bb4d88 /arch | |
| parent | 3146b39c185f8a436d430132457e84fa1d8f8208 (diff) | |
| parent | e48395f1753cab0fde6c03f1db833cece9ef2ba0 (diff) | |
| download | linux-3.10-e80eaf9904d5b19512265e1435372b2e12146a5f.tar.gz linux-3.10-e80eaf9904d5b19512265e1435372b2e12146a5f.tar.bz2 linux-3.10-e80eaf9904d5b19512265e1435372b2e12146a5f.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix xics set_affinity code
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 5bd90a7eb76..f0b5ff17d86 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c @@ -419,7 +419,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask) * For the moment only implement delivery to all cpus or one cpu. * Get current irq_server for the given irq */ - irq_server = get_irq_server(irq, 1); + irq_server = get_irq_server(virq, 1); if (irq_server == -1) { char cpulist[128]; cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask); |