lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linux-2.6' into for-2.6.24

Browse Source
This commit is contained in:
Paul Mackerras
2007-10-03 15:33:17 +10:00
parent a0c7ce9c87 f778089cb2
commit 70f227d884
170 changed files with 2331 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/pseries/xics.c
View File

@@ -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);