Excerpts from Christophe Leroy's message of March 16, 2021 8:49 pm: > > > Le 16/03/2021 à 11:41, Nicholas Piggin a écrit : >> Update the new C and asm interrupt return code to account for 64e >> specifics, switch over to use it. >> >> The now-unused old ret_from_except code, that was moved to 64e after the >> 64s conversion, is removed. >> >> Signed-off-by: Nicholas Piggin <npig...@gmail.com> >> --- >> arch/powerpc/include/asm/asm-prototypes.h | 2 - >> arch/powerpc/include/asm/ppc_asm.h | 20 -- >> arch/powerpc/kernel/asm-offsets.c | 10 - >> arch/powerpc/kernel/exceptions-64e.S | 321 ++-------------------- >> arch/powerpc/kernel/irq.c | 76 ----- >> 5 files changed, 25 insertions(+), 404 deletions(-) >> > >> diff --git a/arch/powerpc/kernel/asm-offsets.c >> b/arch/powerpc/kernel/asm-offsets.c >> index 85ba2b0bc8d8..c880ad18b851 100644 >> --- a/arch/powerpc/kernel/asm-offsets.c >> +++ b/arch/powerpc/kernel/asm-offsets.c >> @@ -282,21 +282,11 @@ int main(void) >> OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id); >> OFFSET(PACAKEXECSTATE, paca_struct, kexec_state); >> OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default); >> - OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime); >> - OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user); >> - OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime); >> - OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime); >> #ifdef CONFIG_PPC_BOOK3E >> OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save); >> #endif >> OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso); >> #else /* CONFIG_PPC64 */ > > The #else is useless
Thanks. I'll hold off re posting until there is some more activity. Thanks, Nick
