diff options
author | Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> | 2014-11-24 11:29:26 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-12-01 19:03:45 -0500 |
commit | 6d626c5ea3d8411cc2a72d7cabe70f01dfc32d1d (patch) | |
tree | 8f3f8c480dc4eaf96967b4fe1e267f1374e13639 /arch/powerpc/kernel | |
parent | a450e8f55a57d049ac3afe218f06567e12d6b4f5 (diff) |
powerpc/powernv: Cleanup unused MCE definitions/declarations.
Cleanup OpalMCE_* definitions/declarations and other related code which
is not used anymore.
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Acked-by: Benjamin Herrrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 7 | ||||
-rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 17 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 9d7dede2847c..c161ef3f28a1 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
@@ -726,12 +726,5 @@ int main(void) | |||
726 | arch.timing_last_enter.tv32.tbl)); | 726 | arch.timing_last_enter.tv32.tbl)); |
727 | #endif | 727 | #endif |
728 | 728 | ||
729 | #ifdef CONFIG_PPC_POWERNV | ||
730 | DEFINE(OPAL_MC_GPR3, offsetof(struct opal_machine_check_event, gpr3)); | ||
731 | DEFINE(OPAL_MC_SRR0, offsetof(struct opal_machine_check_event, srr0)); | ||
732 | DEFINE(OPAL_MC_SRR1, offsetof(struct opal_machine_check_event, srr1)); | ||
733 | DEFINE(PACA_OPAL_MC_EVT, offsetof(struct paca_struct, opal_mc_evt)); | ||
734 | #endif | ||
735 | |||
736 | return 0; | 729 | return 0; |
737 | } | 730 | } |
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index a1d45c161e24..ad62f4d6ce31 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
@@ -1312,23 +1312,6 @@ hmi_exception_after_realmode: | |||
1312 | EXCEPTION_PROLOG_0(PACA_EXGEN) | 1312 | EXCEPTION_PROLOG_0(PACA_EXGEN) |
1313 | b hmi_exception_hv | 1313 | b hmi_exception_hv |
1314 | 1314 | ||
1315 | #ifdef CONFIG_PPC_POWERNV | ||
1316 | _GLOBAL(opal_mc_secondary_handler) | ||
1317 | HMT_MEDIUM_PPR_DISCARD | ||
1318 | SET_SCRATCH0(r13) | ||
1319 | GET_PACA(r13) | ||
1320 | clrldi r3,r3,2 | ||
1321 | tovirt(r3,r3) | ||
1322 | std r3,PACA_OPAL_MC_EVT(r13) | ||
1323 | ld r13,OPAL_MC_SRR0(r3) | ||
1324 | mtspr SPRN_SRR0,r13 | ||
1325 | ld r13,OPAL_MC_SRR1(r3) | ||
1326 | mtspr SPRN_SRR1,r13 | ||
1327 | ld r3,OPAL_MC_GPR3(r3) | ||
1328 | GET_SCRATCH0(r13) | ||
1329 | b machine_check_pSeries | ||
1330 | #endif /* CONFIG_PPC_POWERNV */ | ||
1331 | |||
1332 | 1315 | ||
1333 | #define MACHINE_CHECK_HANDLER_WINDUP \ | 1316 | #define MACHINE_CHECK_HANDLER_WINDUP \ |
1334 | /* Clear MSR_RI before setting SRR0 and SRR1. */\ | 1317 | /* Clear MSR_RI before setting SRR0 and SRR1. */\ |