Messages in this thread Patch in this message | | | Date | Thu, 6 Jul 2006 10:23:41 +0200 | From | Ingo Molnar <> | Subject | [patch] uninline init_waitqueue_*() functions |
| |
Subject: uninline init_waitqueue_*() functions From: Ingo Molnar <mingo@elte.hu>
uninline more wait.h inline functions.
allyesconfig vmlinux size delta:
text data bss dec filename 20736884 6073834 3075176 29885894 vmlinux.before 20721009 6073966 3075176 29870151 vmlinux.after
~18 bytes per callsite, 15K of text size (~0.1%) saved.
(as an added bonus this also removes a lockdep annotation.)
Signed-off-by: Ingo Molnar <mingo@elte.hu> --- include/linux/wait.h | 29 +++-------------------------- kernel/wait.c | 26 ++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 28 deletions(-)
Index: linux/include/linux/wait.h =================================================================== --- linux.orig/include/linux/wait.h +++ linux/include/linux/wait.h @@ -77,32 +77,9 @@ struct task_struct; #define __WAIT_BIT_KEY_INITIALIZER(word, bit) \ { .flags = word, .bit_nr = bit, } -/* - * lockdep: we want one lock-class for all waitqueue locks. - */ -extern struct lock_class_key waitqueue_lock_key; - -static inline void init_waitqueue_head(wait_queue_head_t *q) -{ - spin_lock_init(&q->lock); - lockdep_set_class(&q->lock, &waitqueue_lock_key); - INIT_LIST_HEAD(&q->task_list); -} - -static inline void init_waitqueue_entry(wait_queue_t *q, struct task_struct *p) -{ - q->flags = 0; - q->private = p; - q->func = default_wake_function; -} - -static inline void init_waitqueue_func_entry(wait_queue_t *q, - wait_queue_func_t func) -{ - q->flags = 0; - q->private = NULL; - q->func = func; -} +extern void init_waitqueue_head(wait_queue_head_t *q); +extern void init_waitqueue_entry(wait_queue_t *q, struct task_struct *p); +extern void init_waitqueue_func_entry(wait_queue_t *q, wait_queue_func_t func); static inline int waitqueue_active(wait_queue_head_t *q) { Index: linux/kernel/wait.c =================================================================== --- linux.orig/kernel/wait.c +++ linux/kernel/wait.c @@ -10,9 +10,31 @@ #include <linux/wait.h> #include <linux/hash.h> -struct lock_class_key waitqueue_lock_key; +void init_waitqueue_head(wait_queue_head_t *q) +{ + spin_lock_init(&q->lock); + INIT_LIST_HEAD(&q->task_list); +} + +EXPORT_SYMBOL(init_waitqueue_head); + +void init_waitqueue_entry(wait_queue_t *q, struct task_struct *p) +{ + q->flags = 0; + q->private = p; + q->func = default_wake_function; +} + +EXPORT_SYMBOL(init_waitqueue_entry); + +void init_waitqueue_func_entry(wait_queue_t *q, wait_queue_func_t func) +{ + q->flags = 0; + q->private = NULL; + q->func = func; +} -EXPORT_SYMBOL(waitqueue_lock_key); +EXPORT_SYMBOL(init_waitqueue_func_entry); void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |