Merge remote-tracking branch 'spi/for-5.10' into spi-linus

[linux-2.6-microblaze.git] / arch / arc / include / asm / entry-compact.h

diff --git a/arch/arc/include/asm/entry-compact.h b/arch/arc/include/asm/entry-compact.h
index c3aa775..6dbf5ce 100644 (file)
--- a/arch/arc/include/asm/entry-compact.h
+++ b/arch/arc/include/asm/entry-compact.h
@@ -33,10 +33,6 @@
 #include <asm/irqflags-compact.h>
 #include <asm/thread_info.h>   /* For THREAD_SIZE */
 
-#ifdef CONFIG_ARC_PLAT_EZNPS
-#include <plat/ctop.h>
-#endif
-
 /*--------------------------------------------------------------
  * Switch to Kernel Mode stack if SP points to User Mode stack
  *
@@ -189,12 +185,6 @@
        PUSHAX  lp_start
        PUSHAX  erbta
 
-#ifdef CONFIG_ARC_PLAT_EZNPS
-       .word CTOP_INST_SCHD_RW
-       PUSHAX  CTOP_AUX_GPA1
-       PUSHAX  CTOP_AUX_EFLAGS
-#endif
-
        lr      r10, [ecr]
        st      r10, [sp, PT_event]    /* EV_Trap expects r10 to have ECR */
 .endm
@@ -211,11 +201,6 @@
  * by hardware and that is not good.
  *-------------------------------------------------------------*/
 .macro EXCEPTION_EPILOGUE
-#ifdef CONFIG_ARC_PLAT_EZNPS
-       .word CTOP_INST_SCHD_RW
-       POPAX   CTOP_AUX_EFLAGS
-       POPAX   CTOP_AUX_GPA1
-#endif
 
        POPAX   erbta
        POPAX   lp_start
@@ -278,11 +263,6 @@
        PUSHAX  lp_start
        PUSHAX  bta_l\LVL\()
 
-#ifdef CONFIG_ARC_PLAT_EZNPS
-       .word CTOP_INST_SCHD_RW
-       PUSHAX  CTOP_AUX_GPA1
-       PUSHAX  CTOP_AUX_EFLAGS
-#endif
 .endm
 
 /*--------------------------------------------------------------
@@ -295,11 +275,6 @@
  * by hardware and that is not good.
  *-------------------------------------------------------------*/
 .macro INTERRUPT_EPILOGUE  LVL
-#ifdef CONFIG_ARC_PLAT_EZNPS
-       .word CTOP_INST_SCHD_RW
-       POPAX   CTOP_AUX_EFLAGS
-       POPAX   CTOP_AUX_GPA1
-#endif
 
        POPAX   bta_l\LVL\()
        POPAX   lp_start
@@ -327,13 +302,11 @@
        bic \reg, sp, (THREAD_SIZE - 1)
 .endm
 
-#ifndef CONFIG_ARC_PLAT_EZNPS
 /* Get CPU-ID of this core */
 .macro  GET_CPU_ID  reg
        lr  \reg, [identity]
        lsr \reg, \reg, 8
        bmsk \reg, \reg, 7
 .endm
-#endif
 
 #endif  /* __ASM_ARC_ENTRY_COMPACT_H */