8d7718aa08
Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic prototypes to use u32 types for the futex as this is the data type the futex core code uses all over the place. Signed-off-by: Michel Lespinasse <walken@google.com> Cc: Darren Hart <darren@dvhart.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Matt Turner <mattst88@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: David Howells <dhowells@redhat.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Michal Simek <monstr@monstr.eu> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> LKML-Reference: <20110311025058.GD26122@google.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
112 lines
1.8 KiB
C
112 lines
1.8 KiB
C
#ifndef __ASM_SH_FUTEX_IRQ_H
|
|
#define __ASM_SH_FUTEX_IRQ_H
|
|
|
|
#include <asm/system.h>
|
|
|
|
static inline int atomic_futex_op_xchg_set(int oparg, u32 __user *uaddr,
|
|
int *oldval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(*oldval, uaddr);
|
|
if (!ret)
|
|
ret = put_user(oparg, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int atomic_futex_op_xchg_add(int oparg, u32 __user *uaddr,
|
|
int *oldval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(*oldval, uaddr);
|
|
if (!ret)
|
|
ret = put_user(*oldval + oparg, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int atomic_futex_op_xchg_or(int oparg, u32 __user *uaddr,
|
|
int *oldval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(*oldval, uaddr);
|
|
if (!ret)
|
|
ret = put_user(*oldval | oparg, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int atomic_futex_op_xchg_and(int oparg, u32 __user *uaddr,
|
|
int *oldval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(*oldval, uaddr);
|
|
if (!ret)
|
|
ret = put_user(*oldval & oparg, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int atomic_futex_op_xchg_xor(int oparg, u32 __user *uaddr,
|
|
int *oldval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(*oldval, uaddr);
|
|
if (!ret)
|
|
ret = put_user(*oldval ^ oparg, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline int atomic_futex_op_cmpxchg_inatomic(u32 *uval,
|
|
u32 __user *uaddr,
|
|
u32 oldval, u32 newval)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
u32 prev = 0;
|
|
|
|
local_irq_save(flags);
|
|
|
|
ret = get_user(prev, uaddr);
|
|
if (!ret && oldval == prev)
|
|
ret = put_user(newval, uaddr);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
*uval = prev;
|
|
return ret;
|
|
}
|
|
|
|
#endif /* __ASM_SH_FUTEX_IRQ_H */
|