---

yaml --- r: 234309 b: refs/heads/master c: 07d5eca h: refs/heads/master i: 234307: 15afd15 v: v3
git-mirror · Mar 14, 2011 · 9d12cc2 · 9d12cc2
1 parent 8367b3f
commit 9d12cc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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"