lkml.org 
[lkml]   [2008]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 037/148] include/asm-x86/futex.h: checkpatch cleanups - formatting only
    Date

    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    include/asm-x86/futex.h | 101 +++++++++++++++++++++++++---------------------
    1 files changed, 55 insertions(+), 46 deletions(-)

    diff --git a/include/asm-x86/futex.h b/include/asm-x86/futex.h
    index c9952ea..ac0fbf2 100644
    --- a/include/asm-x86/futex.h
    +++ b/include/asm-x86/futex.h
    @@ -12,35 +12,32 @@
    #include <asm/uaccess.h>

    #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
    - __asm__ __volatile( \
    -"1: " insn "\n" \
    -"2: .section .fixup,\"ax\"\n \
    -3: mov %3, %1\n \
    - jmp 2b\n \
    - .previous\n" \
    - _ASM_EXTABLE(1b,3b) \
    - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
    - : "i" (-EFAULT), "0" (oparg), "1" (0))
    + asm volatile("1:\t" insn "\n" \
    + "2:\t.section .fixup,\"ax\"\n" \
    + "3:\tmov\t%3, %1\n" \
    + "\tjmp\t2b\n" \
    + "\t.previous\n" \
    + _ASM_EXTABLE(1b, 3b) \
    + : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
    + : "i" (-EFAULT), "0" (oparg), "1" (0))

    #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
    - __asm__ __volatile( \
    -"1: movl %2, %0\n \
    - movl %0, %3\n" \
    - insn "\n" \
    -"2: lock; cmpxchgl %3, %2\n \
    - jnz 1b\n \
    -3: .section .fixup,\"ax\"\n \
    -4: mov %5, %1\n \
    - jmp 3b\n \
    - .previous\n" \
    - _ASM_EXTABLE(1b,4b) \
    - _ASM_EXTABLE(2b,4b) \
    - : "=&a" (oldval), "=&r" (ret), "+m" (*uaddr), \
    - "=&r" (tem) \
    - : "r" (oparg), "i" (-EFAULT), "1" (0))
    -
    -static inline int
    -futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
    + asm volatile("1:\tmovl %2, %0\n" \
    + "\tmovl\t%0, %3\n" \
    + "\t" insn "\n" \
    + "2:\tlock; cmpxchgl %3, %2\n" \
    + "\tjnz\t1b\n" \
    + "3:\t.section .fixup,\"ax\"\n" \
    + "4:\tmov\t%5, %1\n" \
    + "\tjmp\t3b\n" \
    + "\t.previous\n" \
    + _ASM_EXTABLE(1b, 4b) \
    + _ASM_EXTABLE(2b, 4b) \
    + : "=&a" (oldval), "=&r" (ret), \
    + "+m" (*uaddr), "=&r" (tem) \
    + : "r" (oparg), "i" (-EFAULT), "1" (0))
    +
    +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;
    @@ -87,20 +84,33 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr)

    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;
    + 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)
    +static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
    + int newval)
    {

    #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP)
    @@ -112,16 +122,15 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
    if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
    return -EFAULT;

    - __asm__ __volatile__(
    - "1: lock; cmpxchgl %3, %1 \n"
    - "2: .section .fixup, \"ax\" \n"
    - "3: mov %2, %0 \n"
    - " jmp 2b \n"
    - " .previous \n"
    - _ASM_EXTABLE(1b,3b)
    - : "=a" (oldval), "+m" (*uaddr)
    - : "i" (-EFAULT), "r" (newval), "0" (oldval)
    - : "memory"
    + asm volatile("1:\tlock; cmpxchgl %3, %1\n"
    + "2:\t.section .fixup, \"ax\"\n"
    + "3:\tmov %2, %0\n"
    + "\tjmp 2b\n"
    + "\t.previous\n"
    + _ASM_EXTABLE(1b, 3b)
    + : "=a" (oldval), "+m" (*uaddr)
    + : "i" (-EFAULT), "r" (newval), "0" (oldval)
    + : "memory"
    );

    return oldval;
    --
    1.5.4.rc2


    \
     
     \ /
      Last update: 2008-03-23 09:59    [W:8.113 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site