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

Commit f8aaeace authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] consolidate asm/futex.h 



Most of the architectures have the same asm/futex.h.  This consolidates them
into asm-generic, with the arches including it from their own asm/futex.h.

In the case of UML, this reverts the old broken futex.h and goes back to using
the same one as almost everyone else.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c66fdd5e

include/asm-alpha/futex.h

+1 −48
Original line number Diff line number Diff line 
#ifndef _ASM_FUTEX_H

#define _ASM_FUTEX_H



#ifdef __KERNEL__

#include <asm-generic/futex.h>



#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/uaccess.h>



static inline int

futex_atomic_op_inuser (int encoded_op, int __user *uaddr)

{

	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;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



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

		return -EFAULT;



	inc_preempt_count();



	switch (op) {

	case FUTEX_OP_SET:

	case FUTEX_OP_ADD:

	case FUTEX_OP_OR:

	case FUTEX_OP_ANDN:

	case FUTEX_OP_XOR:

	default:

		ret = -ENOSYS;

	}



	dec_preempt_count();



	if (!ret) {

		switch (cmp) {

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

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

}



#endif

#endif

include/asm-arm/futex.h

+1 −48
Original line number Diff line number Diff line 
#ifndef _ASM_FUTEX_H

#define _ASM_FUTEX_H



#ifdef __KERNEL__

#include <asm-generic/futex.h>



#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/uaccess.h>



static inline int

futex_atomic_op_inuser (int encoded_op, int __user *uaddr)

{

	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;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



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

		return -EFAULT;



	inc_preempt_count();



	switch (op) {

	case FUTEX_OP_SET:

	case FUTEX_OP_ADD:

	case FUTEX_OP_OR:

	case FUTEX_OP_ANDN:

	case FUTEX_OP_XOR:

	default:

		ret = -ENOSYS;

	}



	dec_preempt_count();



	if (!ret) {

		switch (cmp) {

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

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

}



#endif

#endif

include/asm-arm26/futex.h

+1 −48
Original line number Diff line number Diff line 
#ifndef _ASM_FUTEX_H

#define _ASM_FUTEX_H



#ifdef __KERNEL__

#include <asm-generic/futex.h>



#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/uaccess.h>



static inline int

futex_atomic_op_inuser (int encoded_op, int __user *uaddr)

{

	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;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



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

		return -EFAULT;



	inc_preempt_count();



	switch (op) {

	case FUTEX_OP_SET:

	case FUTEX_OP_ADD:

	case FUTEX_OP_OR:

	case FUTEX_OP_ANDN:

	case FUTEX_OP_XOR:

	default:

		ret = -ENOSYS;

	}



	dec_preempt_count();



	if (!ret) {

		switch (cmp) {

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

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

}



#endif

#endif

include/asm-cris/futex.h

+1 −48
Original line number Diff line number Diff line 
#ifndef _ASM_FUTEX_H

#define _ASM_FUTEX_H



#ifdef __KERNEL__

#include <asm-generic/futex.h>



#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/uaccess.h>



static inline int

futex_atomic_op_inuser (int encoded_op, int __user *uaddr)

{

	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;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



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

		return -EFAULT;



	inc_preempt_count();



	switch (op) {

	case FUTEX_OP_SET:

	case FUTEX_OP_ADD:

	case FUTEX_OP_OR:

	case FUTEX_OP_ANDN:

	case FUTEX_OP_XOR:

	default:

		ret = -ENOSYS;

	}



	dec_preempt_count();



	if (!ret) {

		switch (cmp) {

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

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

}



#endif

#endif

include/asm-generic/futex.h

0 → 100644
+53 −0
Original line number Diff line number Diff line 
#ifndef _ASM_GENERIC_FUTEX_H

#define _ASM_GENERIC_FUTEX_H



#ifdef __KERNEL__



#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/uaccess.h>



static inline int

futex_atomic_op_inuser (int encoded_op, int __user *uaddr)

{

	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;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



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

		return -EFAULT;



	inc_preempt_count();



	switch (op) {

	case FUTEX_OP_SET:

	case FUTEX_OP_ADD:

	case FUTEX_OP_OR:

	case FUTEX_OP_ANDN:

	case FUTEX_OP_XOR:

	default:

		ret = -ENOSYS;

	}



	dec_preempt_count();



	if (!ret) {

		switch (cmp) {

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

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

}



#endif

#endif