diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-17 07:45:35 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-17 07:45:35 +1000 |
| commit | c7cd5b98072f7e04a50415b9501793bd905ecc16 (patch) | |
| tree | 1c0bdbf863dcc4262abebf8dc3a4d7f5218c22b2 /arch/powerpc/sysdev | |
| parent | e92716f2aa68cdfbf6ec24d6f31f08b072e1a246 (diff) | |
| parent | 7132799b0e49c48cf119dbe02d20810860d20991 (diff) | |
| download | linux-c7cd5b98072f7e04a50415b9501793bd905ecc16.tar.gz linux-c7cd5b98072f7e04a50415b9501793bd905ecc16.tar.bz2 linux-c7cd5b98072f7e04a50415b9501793bd905ecc16.zip | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 6131fd2b6619..8619f2a3f1f6 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1410,11 +1410,6 @@ void mpic_cpu_set_priority(int prio) mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), prio); } -/* - * XXX: someone who knows mpic should check this. - * do we need to eoi the ipi including for kexec cpu here (see xics comments)? - * or can we reset the mpic in the new kernel? - */ void mpic_teardown_this_cpu(int secondary) { struct mpic *mpic = mpic_primary; @@ -1434,6 +1429,10 @@ void mpic_teardown_this_cpu(int secondary) /* Set current processor priority to max */ mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf); + /* We need to EOI the IPI since not all platforms reset the MPIC + * on boot and new interrupts wouldn't get delivered otherwise. + */ + mpic_eoi(mpic); spin_unlock_irqrestore(&mpic_lock, flags); } |