Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99aed91a authored by John David Anglin's avatar John David Anglin Committed by Helge Deller
Browse files

parisc: Update futex.h to match generic implementation 



The attached patch updates the parisc version of futex.h to match the
current generic implementation except for the spinlock code.

Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 4df3c9ec

arch/parisc/include/asm/futex.h

+29 −41
Original line number Diff line number Diff line
@@ -35,70 +35,57 @@ static inline int 
futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)

{

	unsigned long int flags;

	u32 val;

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;

	int oldval, ret;

	u32 tmp;



	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(*uaddr)))

		return -EFAULT;



	_futex_spin_lock_irqsave(uaddr, &flags);

	pagefault_disable();



	_futex_spin_lock_irqsave(uaddr, &flags);

	ret = -EFAULT;

	if (unlikely(get_user(oldval, uaddr) != 0))

		goto out_pagefault_enable;



	ret = 0;

	tmp = oldval;



	switch (op) {

	case FUTEX_OP_SET:

		/* *(int *)UADDR2 = OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret)

			ret = put_user(oparg, uaddr);

		tmp = oparg;

		break;

	case FUTEX_OP_ADD:

		/* *(int *)UADDR2 += OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval + oparg;

			ret = put_user(val, uaddr);

		}

		tmp += oparg;

		break;

	case FUTEX_OP_OR:

		/* *(int *)UADDR2 |= OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval | oparg;

			ret = put_user(val, uaddr);

		}

		tmp |= oparg;

		break;

	case FUTEX_OP_ANDN:

		/* *(int *)UADDR2 &= ~OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval & ~oparg;

			ret = put_user(val, uaddr);

		}

		tmp &= ~oparg;

		break;

	case FUTEX_OP_XOR:

		/* *(int *)UADDR2 ^= OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval ^ oparg;

			ret = put_user(val, uaddr);

		}

		tmp ^= oparg;

		break;

	default:

		ret = -ENOSYS;

	}



	_futex_spin_unlock_irqrestore(uaddr, &flags);

	if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))

		ret = -EFAULT;



out_pagefault_enable:

	pagefault_enable();

	_futex_spin_unlock_irqrestore(uaddr, &flags);



	if (!ret) {

	if (ret == 0) {

		switch (cmp) {

		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
@@ -112,12 +99,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 
	return ret;

}



/* Non-atomic version */

static inline int

futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,

			      u32 oldval, u32 newval)

{

	int ret;

	u32 val;

	unsigned long flags;
@@ -137,17 +122,20 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	 */



	_futex_spin_lock_irqsave(uaddr, &flags);

	if (unlikely(get_user(val, uaddr) != 0)) {

		_futex_spin_unlock_irqrestore(uaddr, &flags);

		return -EFAULT;

	}



	ret = get_user(val, uaddr);



	if (!ret && val == oldval)

		ret = put_user(newval, uaddr);

	if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) {

		_futex_spin_unlock_irqrestore(uaddr, &flags);

		return -EFAULT;

	}



	*uval = val;



	_futex_spin_unlock_irqrestore(uaddr, &flags);



	return ret;

	return 0;

}



#endif /*__KERNEL__*/