Remove no longer needed or - in case of sev() - unneeded abstractions and prototypes from the processor headers.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm/include/asm/processor.h | 5 ----- hypervisor/arch/arm/include/asm/spinlock.h | 2 +- hypervisor/arch/arm64/include/asm/processor.h | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hypervisor/arch/arm/include/asm/processor.h b/hypervisor/arch/arm/include/asm/processor.h index 3556613..432c0da 100644 --- a/hypervisor/arch/arm/include/asm/processor.h +++ b/hypervisor/arch/arm/include/asm/processor.h @@ -178,10 +178,6 @@ struct registers { #define dsb(domain) asm volatile("dsb " #domain ::: "memory") #define isb() asm volatile("isb") -#define wfe() asm volatile("wfe") -#define wfi() asm volatile("wfi") -#define sev() asm volatile("sev") - #define arm_read_banked_reg(reg, val) \ asm volatile ("mrs %0, " #reg "\n" : "=r" (val)) @@ -196,7 +192,6 @@ struct registers { arm_write_banked_reg(reg, val); \ } while (0) -unsigned int smc(unsigned int r0, ...); unsigned int hvc(unsigned int r0, ...); static inline void cpu_relax(void) diff --git a/hypervisor/arch/arm/include/asm/spinlock.h b/hypervisor/arch/arm/include/asm/spinlock.h index 983d51c..a1e9a27 100644 --- a/hypervisor/arch/arm/include/asm/spinlock.h +++ b/hypervisor/arch/arm/include/asm/spinlock.h @@ -72,7 +72,7 @@ static inline void spin_unlock(spinlock_t *lock) /* Ensure the spinlock is updated before notifying other CPUs */ dsb(ishst); - sev(); + asm volatile("sev"); } #endif /* !__ASSEMBLY__ */ diff --git a/hypervisor/arch/arm64/include/asm/processor.h b/hypervisor/arch/arm64/include/asm/processor.h index db42c4f..d442829 100644 --- a/hypervisor/arch/arm64/include/asm/processor.h +++ b/hypervisor/arch/arm64/include/asm/processor.h @@ -164,12 +164,6 @@ struct registers { #define dsb(domain) asm volatile("dsb " #domain "\n" : : : "memory") #define isb() asm volatile("isb\n") -#define wfe() asm volatile("wfe\n") -#define wfi() asm volatile("wfi\n") -#define sev() asm volatile("sev\n") - -unsigned int smc(unsigned int r0, ...); - static inline void cpu_relax(void) { asm volatile("" : : : "memory"); -- 2.1.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
