summaryrefslogtreecommitdiffstats
path: root/include/linux/wait.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-05 11:25:39 +0100
committerIngo Molnar <mingo@kernel.org>2017-06-20 12:18:28 +0200
commit2141713616c652aeabf2dd5c1e89bc601c4fed6a (patch)
tree506baaf0994e1279805c4991bc904c5fbcaa9ed3 /include/linux/wait.h
parent9d9d676f595b5081326be7a17dc681fcb38fb3b2 (diff)
downloadlinux-2141713616c652aeabf2dd5c1e89bc601c4fed6a.tar.gz
linux-2141713616c652aeabf2dd5c1e89bc601c4fed6a.tar.bz2
linux-2141713616c652aeabf2dd5c1e89bc601c4fed6a.zip
sched/wait: Standardize 'struct wait_bit_queue' wait-queue entry field name
Rename 'struct wait_bit_queue::wait' to ::wq_entry, to more clearly name it as a wait-queue entry. Propagate it to a couple of usage sites where the wait-bit-queue internals are exposed. Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r--include/linux/wait.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index c3d1cefc7853..1c8add685f22 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -38,7 +38,7 @@ struct wait_bit_key {
struct wait_bit_queue {
struct wait_bit_key key;
- struct wait_queue_entry wait;
+ struct wait_queue_entry wq_entry;
};
struct wait_queue_head {
@@ -991,11 +991,11 @@ int wake_bit_function(struct wait_queue_entry *wq_entry, unsigned mode, int sync
#define DEFINE_WAIT_BIT(name, word, bit) \
struct wait_bit_queue name = { \
.key = __WAIT_BIT_KEY_INITIALIZER(word, bit), \
- .wait = { \
+ .wq_entry = { \
.private = current, \
.func = wake_bit_function, \
.task_list = \
- LIST_HEAD_INIT((name).wait.task_list), \
+ LIST_HEAD_INIT((name).wq_entry.task_list), \
}, \
}