Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84770
b: refs/heads/master
c: 6d141c3
h: refs/heads/master
v: v3
  • Loading branch information
Li Zefan authored and Linus Torvalds committed Feb 8, 2008
1 parent 45070d1 commit a9ab9e1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ae161068756c203ccbeeb9178f4d4f6665d294cf
refs/heads/master: 6d141c3ff6d74cc30cdbf26155842756ac16cf7f
2 changes: 0 additions & 2 deletions trunk/include/linux/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a9ab9e1

Please sign in to comment.