aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-02-08 04:21:09 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:22:37 -0800
commit6d141c3ff6d74cc30cdbf26155842756ac16cf7f (patch)
tree55c20a99ba64aa48ebc17d1df61e9c7e7a5dd0cc
parentae161068756c203ccbeeb9178f4d4f6665d294cf (diff)
workqueue: make delayed_work_timer_fn() static
delayed_work_timer_fn() is a timer function, make it static. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/timer.h2
-rw-r--r--kernel/workqueue.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index ffe438a901b..979fefdeb86 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -124,8 +124,6 @@ static inline void timer_stats_timer_clear_start_info(struct timer_list *timer)
}
#endif
-extern void delayed_work_timer_fn(unsigned long __data);
-
/**
* add_timer - start a timer
* @timer: the timer to be added
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 3f168e00ce5..ff06611655a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -175,7 +175,7 @@ int queue_work(struct workqueue_struct *wq, struct work_struct *work)
}
EXPORT_SYMBOL_GPL(queue_work);
-void delayed_work_timer_fn(unsigned long __data)
+static void delayed_work_timer_fn(unsigned long __data)
{
struct delayed_work *dwork = (struct delayed_work *)__data;
struct cpu_workqueue_struct *cwq = get_wq_data(&dwork->work);