In order to prepare introducing these symbols into the global namespace; rename: s/__unqueue_futex/__futex_unqueue/g
Unified · Split
| @@ -1470,12 +1470,12 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb, · 1469 unmodified lines | |||
| 1470 | } | 1470 | } |
| 1471 | 1471 | ||
| 1472 | /** | 1472 | /** |
| 1473 | * __unqueue_futex() - Remove the futex_q from its futex_hash_bucket | 1473 | * __futex_unqueue() - Remove the futex_q from its futex_hash_bucket |
| 1474 | * @q: The futex_q to unqueue | 1474 | * @q: The futex_q to unqueue |
| 1475 | * | 1475 | * |
| 1476 | * The q->lock_ptr must not be NULL and must be held by the caller. | 1476 | * The q->lock_ptr must not be NULL and must be held by the caller. |
| 1477 | */ | 1477 | */ |
| 1478 | static void __unqueue_futex(struct futex_q *q) | 1478 | static void __futex_unqueue(struct futex_q *q) |
| 1479 | { | 1479 | { |
| 1480 | struct futex_hash_bucket *hb; | 1480 | struct futex_hash_bucket *hb; |
| 1481 | 1481 | ||
| @@ -1502,13 +1502,13 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q) · 20 unmodified lines | |||
| 1502 | return; | 1502 | return; |
| 1503 | 1503 | ||
| 1504 | get_task_struct(p); | 1504 | get_task_struct(p); |
| 1505 | __unqueue_futex(q); | 1505 | __futex_unqueue(q); |
| 1506 | /* | 1506 | /* |
| 1507 | * The waiting task can free the futex_q as soon as q->lock_ptr = NULL | 1507 | * The waiting task can free the futex_q as soon as q->lock_ptr = NULL |
| 1508 | * is written, without taking any locks. This is possible in the event | 1508 | * is written, without taking any locks. This is possible in the event |
| 1509 | * of a spurious wakeup, for example. A memory barrier is required here | 1509 | * of a spurious wakeup, for example. A memory barrier is required here |
| 1510 | * to prevent the following store to lock_ptr from getting ahead of the | 1510 | * to prevent the following store to lock_ptr from getting ahead of the |
| 1511 | * plist_del in __unqueue_futex(). | 1511 | * plist_del in __futex_unqueue(). |
| 1512 | */ | 1512 | */ |
| 1513 | smp_store_release(&q->lock_ptr, NULL); | 1513 | smp_store_release(&q->lock_ptr, NULL); |
| 1514 | 1514 | ||
| @@ -1958,7 +1958,7 @@ void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key, · 443 unmodified lines | |||
| 1958 | { | 1958 | { |
| 1959 | q->key = *key; | 1959 | q->key = *key; |
| 1960 | 1960 | ||
| 1961 | __unqueue_futex(q); | 1961 | __futex_unqueue(q); |
| 1962 | 1962 | ||
| 1963 | WARN_ON(!q->rt_waiter); | 1963 | WARN_ON(!q->rt_waiter); |
| 1964 | q->rt_waiter = NULL; | 1964 | q->rt_waiter = NULL; |
| @@ -2522,7 +2522,7 @@ retry: · 557 unmodified lines | |||
| 2522 | spin_unlock(lock_ptr); | 2522 | spin_unlock(lock_ptr); |
| 2523 | goto retry; | 2523 | goto retry; |
| 2524 | } | 2524 | } |
| 2525 | __unqueue_futex(q); | 2525 | __futex_unqueue(q); |
| 2526 | 2526 | ||
| 2527 | BUG_ON(q->pi_state); | 2527 | BUG_ON(q->pi_state); |
| 2528 | 2528 | ||
| @@ -2539,7 +2539,7 @@ retry: · 10 unmodified lines | |||
| 2539 | */ | 2539 | */ |
| 2540 | static void futex_unqueue_pi(struct futex_q *q) | 2540 | static void futex_unqueue_pi(struct futex_q *q) |
| 2541 | { | 2541 | { |
| 2542 | __unqueue_futex(q); | 2542 | __futex_unqueue(q); |
| 2543 | 2543 | ||
| 2544 | BUG_ON(!q->pi_state); | 2544 | BUG_ON(!q->pi_state); |
| 2545 | put_pi_state(q->pi_state); | 2545 | put_pi_state(q->pi_state); |