From 9d12cc28829f30aafe63f9a903e7a14ad264a519 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 14 Mar 2011 20:00:30 +0100 Subject: [PATCH] --- yaml --- r: 234309 b: refs/heads/master c: 07d5ecae2940ddd77746e2fb597dcf57d3c2e277 h: refs/heads/master i: 234307: 15afd15a07559174a157028ea58f215ce441e8c9 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/futex.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 46a7407f92ad..bf4db358e18f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e0aa9f8a8190e0879a29bd67aa606b51734a122 +refs/heads/master: 07d5ecae2940ddd77746e2fb597dcf57d3c2e277 diff --git a/trunk/arch/arm/include/asm/futex.h b/trunk/arch/arm/include/asm/futex.h index 0e29d8e6a5c2..199a6b6de7f4 100644 --- a/trunk/arch/arm/include/asm/futex.h +++ b/trunk/arch/arm/include/asm/futex.h @@ -97,9 +97,6 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; - /* Note that preemption is disabled by futex_atomic_cmpxchg_inatomic - * call sites. */ - __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" "1: " T(ldr) " %1, [%4]\n" " teq %1, %2\n"