aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index d725676d84f3..e45a65e41686 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(get_futex_key_refs);
293 */ 293 */
294void drop_futex_key_refs(union futex_key *key) 294void drop_futex_key_refs(union futex_key *key)
295{ 295{
296 if (key->both.ptr == 0) 296 if (!key->both.ptr)
297 return; 297 return;
298 switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { 298 switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) {
299 case FUT_OFF_INODE: 299 case FUT_OFF_INODE:
@@ -1046,7 +1046,7 @@ static int unqueue_me(struct futex_q *q)
1046 retry: 1046 retry:
1047 lock_ptr = q->lock_ptr; 1047 lock_ptr = q->lock_ptr;
1048 barrier(); 1048 barrier();
1049 if (lock_ptr != 0) { 1049 if (lock_ptr != NULL) {
1050 spin_lock(lock_ptr); 1050 spin_lock(lock_ptr);
1051 /* 1051 /*
1052 * q->lock_ptr can change between reading it and 1052 * q->lock_ptr can change between reading it and