Commit e0b5687b authored by Madhavan Srinivasan's avatar Madhavan Srinivasan Committed by Michael Ellerman

powerpc/64: Implement and use soft_enabled_return API

Add a new wrapper function, soft_enabled_return(), added to return
paca->soft_enabled value.
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0b63acf4
...@@ -49,6 +49,18 @@ extern void unknown_exception(struct pt_regs *regs); ...@@ -49,6 +49,18 @@ extern void unknown_exception(struct pt_regs *regs);
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/paca.h> #include <asm/paca.h>
static inline notrace unsigned long soft_enabled_return(void)
{
unsigned long flags;
asm volatile(
"lbz %0,%1(13)"
: "=r" (flags)
: "i" (offsetof(struct paca_struct, soft_enabled)));
return flags;
}
/* /*
* The "memory" clobber acts as both a compiler barrier * The "memory" clobber acts as both a compiler barrier
* for the critical section and as a clobber because * for the critical section and as a clobber because
...@@ -66,14 +78,7 @@ static inline notrace void soft_enabled_set(unsigned long enable) ...@@ -66,14 +78,7 @@ static inline notrace void soft_enabled_set(unsigned long enable)
static inline unsigned long arch_local_save_flags(void) static inline unsigned long arch_local_save_flags(void)
{ {
unsigned long flags; return soft_enabled_return();
asm volatile(
"lbz %0,%1(13)"
: "=r" (flags)
: "i" (offsetof(struct paca_struct, soft_enabled)));
return flags;
} }
static inline void arch_local_irq_disable(void) static inline void arch_local_irq_disable(void)
......
...@@ -244,7 +244,7 @@ static u64 scan_dispatch_log(u64 stop_tb) ...@@ -244,7 +244,7 @@ static u64 scan_dispatch_log(u64 stop_tb)
void accumulate_stolen_time(void) void accumulate_stolen_time(void)
{ {
u64 sst, ust; u64 sst, ust;
u8 save_soft_enabled = local_paca->soft_enabled; unsigned long save_soft_enabled = soft_enabled_return();
struct cpu_accounting_data *acct = &local_paca->accounting; struct cpu_accounting_data *acct = &local_paca->accounting;
/* We are called early in the exception entry, before /* We are called early in the exception entry, before
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment