diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
| commit | b70b92e41d95fd906f05f6e98f61209201495fa7 (patch) | |
| tree | 594890f30f1d89d54eccfd2780dfc033bd2fdd06 /kernel/timer.c | |
| parent | 1e68b2b2756fc3488ecbade5ad5f13302b3aaafc (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index c01e568935ea..faf2db897de4 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -757,6 +757,7 @@ void add_timer_on(struct timer_list *timer, int cpu) | |||
| 757 | wake_up_idle_cpu(cpu); | 757 | wake_up_idle_cpu(cpu); |
| 758 | spin_unlock_irqrestore(&base->lock, flags); | 758 | spin_unlock_irqrestore(&base->lock, flags); |
| 759 | } | 759 | } |
| 760 | EXPORT_SYMBOL_GPL(add_timer_on); | ||
| 760 | 761 | ||
| 761 | /** | 762 | /** |
| 762 | * del_timer - deactive a timer. | 763 | * del_timer - deactive a timer. |