aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/futex.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-14 15:00:30 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-14 16:10:26 -0400
commit07d5ecae2940ddd77746e2fb597dcf57d3c2e277 (patch)
tree2755106df53db441230d1e5356a65bde0274f20c /arch/arm/include/asm/futex.h
parent6e0aa9f8a8190e0879a29bd67aa606b51734a122 (diff)
arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic()
commit 522d7dec(futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic()) added a bogus comment. /* Note that preemption is disabled by futex_atomic_cmpxchg_inatomic * call sites. */ Bogus in two aspects: 1) pagefault_disable != preempt_disable even if the mechanism we use is the same 2) we have a call site which deliberately does not disable pagefaults as it wants the possible fault to be handled - though that has been changed for consistency reasons now. Sigh. I really should have seen that when committing the above. :( Catched-by-and-rightfully-ranted-at-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <alpine.LFD.2.00.1103141126590.2787@localhost6.localdomain6> Cc: Michel Lespinasse <walken@google.com> Cc: Darren Hart <darren@dvhart.com>
Diffstat (limited to 'arch/arm/include/asm/futex.h')
-rw-r--r--arch/arm/include/asm/futex.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
index 0e29d8e6a5c2..199a6b6de7f4 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
@@ -97,9 +97,6 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
97 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) 97 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
98 return -EFAULT; 98 return -EFAULT;
99 99
100 /* Note that preemption is disabled by futex_atomic_cmpxchg_inatomic
101 * call sites. */
102
103 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" 100 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
104 "1: " T(ldr) " %1, [%4]\n" 101 "1: " T(ldr) " %1, [%4]\n"
105 " teq %1, %2\n" 102 " teq %1, %2\n"