leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/64: Fix arch_local_irq_disable() prototype

Browse Source 
In powerpc/64, the arch_local_irq_disable() function returns unsigned
long, which is not consistent with other architectures.

Move that set-return asm implementation into arch_local_irq_save(),
and make arch_local_irq_disable() return void, simplifying the
assembly.

Suggested-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Madhavan Srinivasan
2017-12-20 09:25:44 +05:30
committed by Michael Ellerman
parent 9f83e00f4c
commit b5c1bd62c0
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/powerpc/include/asm/hw_irq.h
View File

@@ -61,18 +61,14 @@ static inline unsigned long arch_local_save_flags(void)
return flags; return flags;
} }
static inline unsigned long arch_local_irq_disable(void) static inline void arch_local_irq_disable(void)
{ {
unsigned long flags;
asm volatile( asm volatile(
"lbz %0,%1(13); stb %2,%1(13)" "stb %0,%1(13)"
: "=&r" (flags) :
: "i" (offsetof(struct paca_struct, soft_enabled)), : "r" (IRQS_DISABLED),
"r" (IRQS_DISABLED) "i" (offsetof(struct paca_struct, soft_enabled))
: "memory"); : "memory");
return flags;
} }
extern void arch_local_irq_restore(unsigned long); extern void arch_local_irq_restore(unsigned long);
@@ -84,7 +80,16 @@ static inline void arch_local_irq_enable(void)
static inline unsigned long arch_local_irq_save(void) static inline unsigned long arch_local_irq_save(void)
{ {
return arch_local_irq_disable(); unsigned long flags;
asm volatile(
"lbz %0,%1(13); stb %2,%1(13)"
: "=&r" (flags)
: "i" (offsetof(struct paca_struct, soft_enabled)),
"r" (IRQS_DISABLED)
: "memory");
return flags;
} }
static inline bool arch_irqs_disabled_flags(unsigned long flags) static inline bool arch_irqs_disabled_flags(unsigned long flags)