lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include/asm-x86/futex.h: checkpatch cleanups - formatting only

Browse Source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Joe Perches
2008-03-23 01:02:12 -07:00
committed by Ingo Molnar
parent 4637bc07c8
commit 9407913fc1
1 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
include/asm-x86/futex.h
View File

@@ -12,35 +12,32 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
__asm__ __volatile( \ asm volatile("1:\t" insn "\n" \
"1: " insn "\n" \ "2:\t.section .fixup,\"ax\"\n" \
"2: .section .fixup,\"ax\"\n \ "3:\tmov\t%3, %1\n" \
3: mov %3, %1\n \ "\tjmp\t2b\n" \
jmp 2b\n \ "\t.previous\n" \
.previous\n" \
_ASM_EXTABLE(1b, 3b) \ _ASM_EXTABLE(1b, 3b) \
: "=r" (oldval), "=r" (ret), "+m" (*uaddr) \ : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
: "i" (-EFAULT), "0" (oparg), "1" (0)) : "i" (-EFAULT), "0" (oparg), "1" (0))
#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \ #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
__asm__ __volatile( \ asm volatile("1:\tmovl %2, %0\n" \
"1: movl %2, %0\n \ "\tmovl\t%0, %3\n" \
movl %0, %3\n" \ "\t" insn "\n" \
insn "\n" \ "2:\tlock; cmpxchgl %3, %2\n" \
"2: lock; cmpxchgl %3, %2\n \ "\tjnz\t1b\n" \
jnz 1b\n \ "3:\t.section .fixup,\"ax\"\n" \
3: .section .fixup,\"ax\"\n \ "4:\tmov\t%5, %1\n" \
4: mov %5, %1\n \ "\tjmp\t3b\n" \
jmp 3b\n \ "\t.previous\n" \
.previous\n" \
_ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \ _ASM_EXTABLE(2b, 4b) \
: "=&a" (oldval), "=&r" (ret), "+m" (*uaddr), \ : "=&a" (oldval), "=&r" (ret), \
"=&r" (tem) \ "+m" (*uaddr), "=&r" (tem) \
: "r" (oparg), "i" (-EFAULT), "1" (0)) : "r" (oparg), "i" (-EFAULT), "1" (0))
static inline int static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
{ {
int op = (encoded_op >> 28) & 7; int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15; int cmp = (encoded_op >> 24) & 15;
@@ -87,20 +84,33 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
if (!ret) { if (!ret) {
switch (cmp) { switch (cmp) {
case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break; case FUTEX_OP_CMP_EQ:
case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break; ret = (oldval == cmparg);
case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break; break;
case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break; case FUTEX_OP_CMP_NE:
case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break; ret = (oldval != cmparg);
case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break; break;
default: ret = -ENOSYS; 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; return ret;
} }
static inline int static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) int newval)
{ {
#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP) #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP)
@@ -112,12 +122,11 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT; return -EFAULT;
__asm__ __volatile__( asm volatile("1:\tlock; cmpxchgl %3, %1\n"
"1: lock; cmpxchgl %3, %1 \n" "2:\t.section .fixup, \"ax\"\n"
"2: .section .fixup, \"ax\" \n" "3:\tmov %2, %0\n"
"3: mov %2, %0 \n" "\tjmp 2b\n"
" jmp 2b \n" "\t.previous\n"
" .previous \n"
_ASM_EXTABLE(1b, 3b) _ASM_EXTABLE(1b, 3b)
: "=a" (oldval), "+m" (*uaddr) : "=a" (oldval), "+m" (*uaddr)
: "i" (-EFAULT), "r" (newval), "0" (oldval) : "i" (-EFAULT), "r" (newval), "0" (oldval)