diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 04:29:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 04:29:35 -0500 |
| commit | c1dfdc7597d051b09555d4ae2acb90403e238746 (patch) | |
| tree | 86aa49f5a2ab25459f9196dd6724bbe6645b1375 /arch/powerpc/sysdev/mpic.c | |
| parent | efbe027e95dc13ac343b6130948418d7ead7ddf1 (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
Merge commit 'v2.6.28-rc8' into sched/core
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index b24e1d085557..1890fb085cde 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -600,7 +600,7 @@ static int irq_choose_cpu(unsigned int virt_irq) | |||
| 600 | cpuid = first_cpu(tmp); | 600 | cpuid = first_cpu(tmp); |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | return cpuid; | 603 | return get_hard_smp_processor_id(cpuid); |
| 604 | } | 604 | } |
| 605 | #else | 605 | #else |
| 606 | static int irq_choose_cpu(unsigned int virt_irq) | 606 | static int irq_choose_cpu(unsigned int virt_irq) |