 cee4cca740
			
		
	
	
	cee4cca740
	
	
	
		
			
			* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
		
			
				
	
	
		
			201 lines
		
	
	
	
		
			4.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			201 lines
		
	
	
	
		
			4.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_FUTEX_H
 | |
| #define _ASM_FUTEX_H
 | |
| 
 | |
| #ifdef __KERNEL__
 | |
| 
 | |
| #include <linux/futex.h>
 | |
| #include <asm/errno.h>
 | |
| #include <asm/uaccess.h>
 | |
| #include <asm/war.h>
 | |
| 
 | |
| #ifdef CONFIG_SMP
 | |
| #define __FUTEX_SMP_SYNC "	sync					\n"
 | |
| #else
 | |
| #define __FUTEX_SMP_SYNC
 | |
| #endif
 | |
| 
 | |
| #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)		\
 | |
| {									\
 | |
| 	if (cpu_has_llsc && R10000_LLSC_WAR) {				\
 | |
| 		__asm__ __volatile__(					\
 | |
| 		"	.set	push				\n"	\
 | |
| 		"	.set	noat				\n"	\
 | |
| 		"	.set	mips3				\n"	\
 | |
| 		"1:	ll	%1, %4	# __futex_atomic_op	\n"	\
 | |
| 		"	.set	mips0				\n"	\
 | |
| 		"	" insn	"				\n"	\
 | |
| 		"	.set	mips3				\n"	\
 | |
| 		"2:	sc	$1, %2				\n"	\
 | |
| 		"	beqzl	$1, 1b				\n"	\
 | |
| 		__FUTEX_SMP_SYNC					\
 | |
| 		"3:						\n"	\
 | |
| 		"	.set	pop				\n"	\
 | |
| 		"	.set	mips0				\n"	\
 | |
| 		"	.section .fixup,\"ax\"			\n"	\
 | |
| 		"4:	li	%0, %6				\n"	\
 | |
| 		"	j	2b				\n"	\
 | |
| 		"	.previous				\n"	\
 | |
| 		"	.section __ex_table,\"a\"		\n"	\
 | |
| 		"	"__UA_ADDR "\t1b, 4b			\n"	\
 | |
| 		"	"__UA_ADDR "\t2b, 4b			\n"	\
 | |
| 		"	.previous				\n"	\
 | |
| 		: "=r" (ret), "=&r" (oldval), "=R" (*uaddr)		\
 | |
| 		: "0" (0), "R" (*uaddr), "Jr" (oparg), "i" (-EFAULT)	\
 | |
| 		: "memory");						\
 | |
| 	} else if (cpu_has_llsc) {					\
 | |
| 		__asm__ __volatile__(					\
 | |
| 		"	.set	push				\n"	\
 | |
| 		"	.set	noat				\n"	\
 | |
| 		"	.set	mips3				\n"	\
 | |
| 		"1:	ll	%1, %4	# __futex_atomic_op	\n"	\
 | |
| 		"	.set	mips0				\n"	\
 | |
| 		"	" insn	"				\n"	\
 | |
| 		"	.set	mips3				\n"	\
 | |
| 		"2:	sc	$1, %2				\n"	\
 | |
| 		"	beqz	$1, 1b				\n"	\
 | |
| 		__FUTEX_SMP_SYNC					\
 | |
| 		"3:						\n"	\
 | |
| 		"	.set	pop				\n"	\
 | |
| 		"	.set	mips0				\n"	\
 | |
| 		"	.section .fixup,\"ax\"			\n"	\
 | |
| 		"4:	li	%0, %6				\n"	\
 | |
| 		"	j	2b				\n"	\
 | |
| 		"	.previous				\n"	\
 | |
| 		"	.section __ex_table,\"a\"		\n"	\
 | |
| 		"	"__UA_ADDR "\t1b, 4b			\n"	\
 | |
| 		"	"__UA_ADDR "\t2b, 4b			\n"	\
 | |
| 		"	.previous				\n"	\
 | |
| 		: "=r" (ret), "=&r" (oldval), "=R" (*uaddr)		\
 | |
| 		: "0" (0), "R" (*uaddr), "Jr" (oparg), "i" (-EFAULT)	\
 | |
| 		: "memory");						\
 | |
| 	} else								\
 | |
| 		ret = -ENOSYS;						\
 | |
| }
 | |
| 
 | |
| 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:
 | |
| 		__futex_atomic_op("move	$1, %z5", ret, oldval, uaddr, oparg);
 | |
| 		break;
 | |
| 
 | |
| 	case FUTEX_OP_ADD:
 | |
| 		__futex_atomic_op("addu	$1, %1, %z5",
 | |
| 		                  ret, oldval, uaddr, oparg);
 | |
| 		break;
 | |
| 	case FUTEX_OP_OR:
 | |
| 		__futex_atomic_op("or	$1, %1, %z5",
 | |
| 		                  ret, oldval, uaddr, oparg);
 | |
| 		break;
 | |
| 	case FUTEX_OP_ANDN:
 | |
| 		__futex_atomic_op("and	$1, %1, %z5",
 | |
| 		                  ret, oldval, uaddr, ~oparg);
 | |
| 		break;
 | |
| 	case FUTEX_OP_XOR:
 | |
| 		__futex_atomic_op("xor	$1, %1, %z5",
 | |
| 		                  ret, oldval, uaddr, oparg);
 | |
| 		break;
 | |
| 	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;
 | |
| }
 | |
| 
 | |
| static inline int
 | |
| futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
 | |
| {
 | |
| 	int retval;
 | |
| 
 | |
| 	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
 | |
| 		return -EFAULT;
 | |
| 
 | |
| 	if (cpu_has_llsc && R10000_LLSC_WAR) {
 | |
| 		__asm__ __volatile__(
 | |
| 		"# futex_atomic_cmpxchg_inatomic			\n"
 | |
| 		"	.set	push					\n"
 | |
| 		"	.set	noat					\n"
 | |
| 		"	.set	mips3					\n"
 | |
| 		"1:	ll	%0, %2					\n"
 | |
| 		"	bne	%0, %z3, 3f				\n"
 | |
| 		"	.set	mips0					\n"
 | |
| 		"	move	$1, %z4					\n"
 | |
| 		"	.set	mips3					\n"
 | |
| 		"2:	sc	$1, %1					\n"
 | |
| 		"	beqzl	$1, 1b					\n"
 | |
| 		__FUTEX_SMP_SYNC
 | |
| 		"3:							\n"
 | |
| 		"	.set	pop					\n"
 | |
| 		"	.section .fixup,\"ax\"				\n"
 | |
| 		"4:	li	%0, %5					\n"
 | |
| 		"	j	3b					\n"
 | |
| 		"	.previous					\n"
 | |
| 		"	.section __ex_table,\"a\"			\n"
 | |
| 		"	"__UA_ADDR "\t1b, 4b				\n"
 | |
| 		"	"__UA_ADDR "\t2b, 4b				\n"
 | |
| 		"	.previous					\n"
 | |
| 		: "=&r" (retval), "=R" (*uaddr)
 | |
| 		: "R" (*uaddr), "Jr" (oldval), "Jr" (newval), "i" (-EFAULT)
 | |
| 		: "memory");
 | |
| 	} else if (cpu_has_llsc) {
 | |
| 		__asm__ __volatile__(
 | |
| 		"# futex_atomic_cmpxchg_inatomic			\n"
 | |
| 		"	.set	push					\n"
 | |
| 		"	.set	noat					\n"
 | |
| 		"	.set	mips3					\n"
 | |
| 		"1:	ll	%0, %2					\n"
 | |
| 		"	bne	%0, %z3, 3f				\n"
 | |
| 		"	.set	mips0					\n"
 | |
| 		"	move	$1, %z4					\n"
 | |
| 		"	.set	mips3					\n"
 | |
| 		"2:	sc	$1, %1					\n"
 | |
| 		"	beqz	$1, 1b					\n"
 | |
| 		__FUTEX_SMP_SYNC
 | |
| 		"3:							\n"
 | |
| 		"	.set	pop					\n"
 | |
| 		"	.section .fixup,\"ax\"				\n"
 | |
| 		"4:	li	%0, %5					\n"
 | |
| 		"	j	3b					\n"
 | |
| 		"	.previous					\n"
 | |
| 		"	.section __ex_table,\"a\"			\n"
 | |
| 		"	"__UA_ADDR "\t1b, 4b				\n"
 | |
| 		"	"__UA_ADDR "\t2b, 4b				\n"
 | |
| 		"	.previous					\n"
 | |
| 		: "=&r" (retval), "=R" (*uaddr)
 | |
| 		: "R" (*uaddr), "Jr" (oldval), "Jr" (newval), "i" (-EFAULT)
 | |
| 		: "memory");
 | |
| 	} else
 | |
| 		return -ENOSYS;
 | |
| 
 | |
| 	return retval;
 | |
| }
 | |
| 
 | |
| #endif
 | |
| #endif
 |