From a9ab9e1889b2273ac02df5116dffa505398ebf63 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 8 Feb 2008 04:21:09 -0800
Subject: [PATCH] --- yaml --- r: 84770 b: refs/heads/master c:
 6d141c3ff6d74cc30cdbf26155842756ac16cf7f h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/timer.h | 2 --
 trunk/kernel/workqueue.c    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ca1685ac64eb..fc77bb9aa224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae161068756c203ccbeeb9178f4d4f6665d294cf
+refs/heads/master: 6d141c3ff6d74cc30cdbf26155842756ac16cf7f
diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h
index ffe438a901b5..979fefdeb862 100644
--- a/trunk/include/linux/timer.h
+++ b/trunk/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/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 3f168e00ce5b..ff06611655af 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/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);