mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-19 17:11:03 +00:00
Code Issues 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
Show stats 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;
}
static inline unsigned long arch_local_irq_disable(void)
static inline void arch_local_irq_disable(void)
{
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)
"stb %0,%1(13)"
:
: "r" (IRQS_DISABLED),
"i" (offsetof(struct paca_struct, soft_enabled))
: "memory");
return flags;
}
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)
{
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)