Le 15/03/2021 à 08:50, Christophe Leroy a écrit :


Le 15/03/2021 à 04:17, 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/kernel/entry_64.S            |   9 +-
  arch/powerpc/kernel/exceptions-64e.S      | 321 ++--------------------
  arch/powerpc/kernel/interrupt.c           |  27 +-
  arch/powerpc/kernel/irq.c                 |  76 -----
  5 files changed, 56 insertions(+), 379 deletions(-)

@@ -1016,284 +1021,8 @@ alignment_more:

...

-fast_exception_return:
-    wrteei    0
-1:    mr    r0,r13
-    ld    r10,_MSR(r1)
-    REST_4GPRS(2, r1)
-    andi.    r6,r10,MSR_PR
-    REST_2GPRS(6, r1)
-    beq    1f
-    ACCOUNT_CPU_USER_EXIT(r13, r10, r11)

Then ACCOUNT_CPU_USER_EXIT can be removed from asm/ppc_asm.h


And all associated definitions in asm-offsets.c

And also ACCOUNT_USER_TIME which was likely left over after the removal of 
ACCOUNT_CPU_USER_ENTRY()

Reply via email to