df9ee29270
Fix the IRQ flag handling naming. In linux/irqflags.h under one configuration, it maps: local_irq_enable() -> raw_local_irq_enable() local_irq_disable() -> raw_local_irq_disable() local_irq_save() -> raw_local_irq_save() ... and under the other configuration, it maps: raw_local_irq_enable() -> local_irq_enable() raw_local_irq_disable() -> local_irq_disable() raw_local_irq_save() -> local_irq_save() ... This is quite confusing. There should be one set of names expected of the arch, and this should be wrapped to give another set of names that are expected by users of this facility. Change this to have the arch provide: flags = arch_local_save_flags() flags = arch_local_irq_save() arch_local_irq_restore(flags) arch_local_irq_disable() arch_local_irq_enable() arch_irqs_disabled_flags(flags) arch_irqs_disabled() arch_safe_halt() Then linux/irqflags.h wraps these to provide: raw_local_save_flags(flags) raw_local_irq_save(flags) raw_local_irq_restore(flags) raw_local_irq_disable() raw_local_irq_enable() raw_irqs_disabled_flags(flags) raw_irqs_disabled() raw_safe_halt() with type checking on the flags 'arguments', and then wraps those to provide: local_save_flags(flags) local_irq_save(flags) local_irq_restore(flags) local_irq_disable() local_irq_enable() irqs_disabled_flags(flags) irqs_disabled() safe_halt() with tracing included if enabled. The arch functions can now all be inline functions rather than some of them having to be macros. Signed-off-by: David Howells <dhowells@redhat.com> [X86, FRV, MN10300] Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> [Tile] Signed-off-by: Michal Simek <monstr@monstr.eu> [Microblaze] Tested-by: Catalin Marinas <catalin.marinas@arm.com> [ARM] Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> [AVR] Acked-by: Tony Luck <tony.luck@intel.com> [IA-64] Acked-by: Hirokazu Takata <takata@linux-m32r.org> [M32R] Acked-by: Greg Ungerer <gerg@uclinux.org> [M68K/M68KNOMMU] Acked-by: Ralf Baechle <ralf@linux-mips.org> [MIPS] Acked-by: Kyle McMartin <kyle@mcmartin.ca> [PA-RISC] Acked-by: Paul Mackerras <paulus@samba.org> [PowerPC] Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> [S390] Acked-by: Chen Liqin <liqin.chen@sunplusct.com> [Score] Acked-by: Matt Fleming <matt@console-pimps.org> [SH] Acked-by: David S. Miller <davem@davemloft.net> [Sparc] Acked-by: Chris Zankel <chris@zankel.net> [Xtensa] Reviewed-by: Richard Henderson <rth@twiddle.net> [Alpha] Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp> [H8300] Cc: starvik@axis.com [CRIS] Cc: jesper.nilsson@axis.com [CRIS] Cc: linux-cris-kernel@axis.com
67 lines
1.4 KiB
C
67 lines
1.4 KiB
C
#ifndef __ASM_GENERIC_CMPXCHG_LOCAL_H
|
|
#define __ASM_GENERIC_CMPXCHG_LOCAL_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/irqflags.h>
|
|
|
|
extern unsigned long wrong_size_cmpxchg(volatile void *ptr);
|
|
|
|
/*
|
|
* Generic version of __cmpxchg_local (disables interrupts). Takes an unsigned
|
|
* long parameter, supporting various types of architectures.
|
|
*/
|
|
static inline unsigned long __cmpxchg_local_generic(volatile void *ptr,
|
|
unsigned long old, unsigned long new, int size)
|
|
{
|
|
unsigned long flags, prev;
|
|
|
|
/*
|
|
* Sanity checking, compile-time.
|
|
*/
|
|
if (size == 8 && sizeof(unsigned long) != 8)
|
|
wrong_size_cmpxchg(ptr);
|
|
|
|
local_irq_save(flags);
|
|
switch (size) {
|
|
case 1: prev = *(u8 *)ptr;
|
|
if (prev == old)
|
|
*(u8 *)ptr = (u8)new;
|
|
break;
|
|
case 2: prev = *(u16 *)ptr;
|
|
if (prev == old)
|
|
*(u16 *)ptr = (u16)new;
|
|
break;
|
|
case 4: prev = *(u32 *)ptr;
|
|
if (prev == old)
|
|
*(u32 *)ptr = (u32)new;
|
|
break;
|
|
case 8: prev = *(u64 *)ptr;
|
|
if (prev == old)
|
|
*(u64 *)ptr = (u64)new;
|
|
break;
|
|
default:
|
|
wrong_size_cmpxchg(ptr);
|
|
}
|
|
local_irq_restore(flags);
|
|
return prev;
|
|
}
|
|
|
|
/*
|
|
* Generic version of __cmpxchg64_local. Takes an u64 parameter.
|
|
*/
|
|
static inline u64 __cmpxchg64_local_generic(volatile void *ptr,
|
|
u64 old, u64 new)
|
|
{
|
|
u64 prev;
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
prev = *(u64 *)ptr;
|
|
if (prev == old)
|
|
*(u64 *)ptr = new;
|
|
local_irq_restore(flags);
|
|
return prev;
|
|
}
|
|
|
|
#endif
|