7847777a45
After changing all consumers of atomics to include <linux/atomic.h>, we
ran into some compile time errors due to this dependency chain:
linux/atomic.h
-> asm/atomic.h
-> asm-generic/atomic-long.h
where atomic-long.h could use funcs defined later in linux/atomic.h
without a prototype. This patches moves the code that includes
asm-generic/atomic*.h to linux/atomic.h.
Archs that need <asm-generic/atomic64.h> need to select
CONFIG_GENERIC_ATOMIC64 from now on (some of them used to include it
unconditionally).
Compile tested on i386 and x86_64 with allnoconfig.
Signed-off-by: Arun Sharma <asharma@fb.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
148 lines
3.4 KiB
C
148 lines
3.4 KiB
C
#ifndef __ARCH_H8300_ATOMIC__
|
|
#define __ARCH_H8300_ATOMIC__
|
|
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* Atomic operations that C can't guarantee us. Useful for
|
|
* resource counting etc..
|
|
*/
|
|
|
|
#define ATOMIC_INIT(i) { (i) }
|
|
|
|
#define atomic_read(v) (*(volatile int *)&(v)->counter)
|
|
#define atomic_set(v, i) (((v)->counter) = i)
|
|
|
|
#include <asm/system.h>
|
|
#include <linux/kernel.h>
|
|
|
|
static __inline__ int atomic_add_return(int i, atomic_t *v)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
local_irq_save(flags);
|
|
ret = v->counter += i;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
#define atomic_add(i, v) atomic_add_return(i, v)
|
|
#define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
|
|
|
|
static __inline__ int atomic_sub_return(int i, atomic_t *v)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
local_irq_save(flags);
|
|
ret = v->counter -= i;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
#define atomic_sub(i, v) atomic_sub_return(i, v)
|
|
#define atomic_sub_and_test(i,v) (atomic_sub_return(i, v) == 0)
|
|
|
|
static __inline__ int atomic_inc_return(atomic_t *v)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
local_irq_save(flags);
|
|
v->counter++;
|
|
ret = v->counter;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
#define atomic_inc(v) atomic_inc_return(v)
|
|
|
|
/*
|
|
* atomic_inc_and_test - increment and test
|
|
* @v: pointer of type atomic_t
|
|
*
|
|
* Atomically increments @v by 1
|
|
* and returns true if the result is zero, or false for all
|
|
* other cases.
|
|
*/
|
|
#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
|
|
|
|
static __inline__ int atomic_dec_return(atomic_t *v)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
local_irq_save(flags);
|
|
--v->counter;
|
|
ret = v->counter;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
#define atomic_dec(v) atomic_dec_return(v)
|
|
|
|
static __inline__ int atomic_dec_and_test(atomic_t *v)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
local_irq_save(flags);
|
|
--v->counter;
|
|
ret = v->counter;
|
|
local_irq_restore(flags);
|
|
return ret == 0;
|
|
}
|
|
|
|
static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
|
|
{
|
|
int ret;
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
ret = v->counter;
|
|
if (likely(ret == old))
|
|
v->counter = new;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
|
|
|
|
static inline int __atomic_add_unless(atomic_t *v, int a, int u)
|
|
{
|
|
int ret;
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
ret = v->counter;
|
|
if (ret != u)
|
|
v->counter += a;
|
|
local_irq_restore(flags);
|
|
return ret;
|
|
}
|
|
|
|
static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)
|
|
{
|
|
__asm__ __volatile__("stc ccr,r1l\n\t"
|
|
"orc #0x80,ccr\n\t"
|
|
"mov.l %0,er0\n\t"
|
|
"and.l %1,er0\n\t"
|
|
"mov.l er0,%0\n\t"
|
|
"ldc r1l,ccr"
|
|
: "=m" (*v) : "g" (~(mask)) :"er0","er1");
|
|
}
|
|
|
|
static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)
|
|
{
|
|
__asm__ __volatile__("stc ccr,r1l\n\t"
|
|
"orc #0x80,ccr\n\t"
|
|
"mov.l %0,er0\n\t"
|
|
"or.l %1,er0\n\t"
|
|
"mov.l er0,%0\n\t"
|
|
"ldc r1l,ccr"
|
|
: "=m" (*v) : "g" (mask) :"er0","er1");
|
|
}
|
|
|
|
/* Atomic operations are already serializing */
|
|
#define smp_mb__before_atomic_dec() barrier()
|
|
#define smp_mb__after_atomic_dec() barrier()
|
|
#define smp_mb__before_atomic_inc() barrier()
|
|
#define smp_mb__after_atomic_inc() barrier()
|
|
|
|
#endif /* __ARCH_H8300_ATOMIC __ */
|