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

Commit c51179fb authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: adapt asm/futex.h to our arch 



Follow up to 4732efbe - uml must just reuse
as-is the backing architecture support. There is a micro-fixup is needed for the
included file, which won't affect i386 behaviour at all.

I've not tested compilation on x86_64, only on x86, but the code is almost the
same except the culprit test, so everything should be ok on x86_64 too.

Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f62378fc

include/asm-i386/futex.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 
	if (op == FUTEX_OP_SET)

	if (op == FUTEX_OP_SET)

		__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);

		__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);

	else {

	else {

#ifndef CONFIG_X86_BSWAP

#if !defined(CONFIG_X86_BSWAP) && !defined(CONFIG_UML)

		if (boot_cpu_data.x86 == 3)

		if (boot_cpu_data.x86 == 3)

			ret = -ENOSYS;

			ret = -ENOSYS;

		else

		else

include/asm-um/futex.h

+5 −46
Original line number Original line Diff line number Diff line 
#ifndef _ASM_FUTEX_H

#ifndef __UM_FUTEX_H

#define _ASM_FUTEX_H

#define __UM_FUTEX_H



#ifdef __KERNEL__





#include <linux/futex.h>

#include <linux/futex.h>

#include <asm/errno.h>

#include <asm/errno.h>

#include <asm/system.h>

#include <asm/processor.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>





static inline int

#include "asm/arch/futex.h"

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, tem;

	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
 
#endif