powerpc/64s/exception: machine check use standard macros to save dar/dsisr (02a12581) · Commits · 戴 / test

arch/powerpc/kernel/exceptions-64s.S

+1 −5

Original line number	Diff line number	Diff line
		@@ -1064,7 +1064,7 @@ BEGIN_FTR_SECTION
		b machine_check_common_early
		END_FTR_SECTION_IFCLR(CPU_FTR_HVMODE)
		machine_check_pSeries_0:
		EXCEPTION_PROLOG_1 EXC_STD, PACA_EXMC, 1, 0x200, 0, 0, 0
		EXCEPTION_PROLOG_1 EXC_STD, PACA_EXMC, 1, 0x200, 1, 1, 0
		/*
		* MSR_RI is not enabled, because PACA_EXMC is being used, so a
		* nested machine check corrupts it. machine_check_common enables
		@@ -1079,10 +1079,6 @@ EXC_COMMON_BEGIN(machine_check_common)
		* Machine check is different because we use a different
		* save area: PACA_EXMC instead of PACA_EXGEN.
		*/
		mfspr r10,SPRN_DAR
		std r10,PACA_EXMC+EX_DAR(r13)
		mfspr r10,SPRN_DSISR
		stw r10,PACA_EXMC+EX_DSISR(r13)
		EXCEPTION_COMMON(PACA_EXMC, 0x200)
		FINISH_NAP
		RECONCILE_IRQ_STATE(r10, r11)