Message ID | 1364207531.1390.271.camel@x61.thuisdomein (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | 9850baed30dd445b0a2bb58045b8edff74953952 |
Delegated to: | Michael Ellerman |
Headers | show |
On Mon, Mar 25, 2013 at 11:32:11AM +0100, Paul Bolle wrote: > Commit c1fb6816fb1b78dd94b673b0fdaa9a7a16e97bd1 ("powerpc: Add > relocation on exception vector handlers") added two lines of code that > depend on the macro CONFIG_HVC_SCOM. That macro doesn't exist. Perhaps > it was intended to use CONFIG_PPC_SCOM here. But since > "maintence_interrupt" is a typo and there's nothing in arch/powerpc that > looks like maintenance_interrupt it seems best to just delete these > lines. It's cruft from our internal tree that snuck into the patch. I was meaning to remove it but you beat me to it. Acked-by: Michael Ellerman <michael@ellerman.id.au> cheers
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 200afa5..9181353 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -870,10 +870,6 @@ tm_unavailable_relon_pSeries_1: . = 0x5500 b denorm_exception_hv #endif -#ifdef CONFIG_HVC_SCOM - STD_RELON_EXCEPTION_HV(0x5600, 0x1600, maintence_interrupt) - KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1600) -#endif /* CONFIG_HVC_SCOM */ STD_RELON_EXCEPTION_PSERIES(0x5700, 0x1700, altivec_assist) /* Other future vectors */
Commit c1fb6816fb1b78dd94b673b0fdaa9a7a16e97bd1 ("powerpc: Add relocation on exception vector handlers") added two lines of code that depend on the macro CONFIG_HVC_SCOM. That macro doesn't exist. Perhaps it was intended to use CONFIG_PPC_SCOM here. But since "maintence_interrupt" is a typo and there's nothing in arch/powerpc that looks like maintenance_interrupt it seems best to just delete these lines. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested, but low risk anyway. arch/powerpc/kernel/exceptions-64s.S | 4 ---- 1 file changed, 4 deletions(-)