diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 09:58:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 09:58:50 -0700 |
| commit | f9db6e095115f9411b9647bdb9d81fe11f3d8b54 (patch) | |
| tree | 243cdffd9c49dffb909d17ec24614d93f527cc8b | |
| parent | 3f27c0d2a469673e0f1efc8004b6f42428aa5b94 (diff) | |
| parent | c81fc2c331b8514ad112054cd2d87e6ec132286b (diff) | |
| download | linux-f9db6e095115f9411b9647bdb9d81fe11f3d8b54.tar.gz linux-f9db6e095115f9411b9647bdb9d81fe11f3d8b54.tar.bz2 linux-f9db6e095115f9411b9647bdb9d81fe11f3d8b54.zip | |
Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clockevent: export register_device and delta2ns
clockevents: tick_broadcast_device can become static
| -rw-r--r-- | kernel/time/clockevents.c | 2 | ||||
| -rw-r--r-- | kernel/time/tick-broadcast.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index d13be216a790..3948fa644a2d 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c @@ -54,6 +54,7 @@ unsigned long clockevent_delta2ns(unsigned long latch, return (unsigned long) clc; } +EXPORT_SYMBOL_GPL(clockevent_delta2ns); /** * clockevents_set_mode - set the operating mode of a clock event device @@ -187,6 +188,7 @@ void clockevents_register_device(struct clock_event_device *dev) spin_unlock(&clockevents_lock); } +EXPORT_SYMBOL_GPL(clockevents_register_device); /* * Noop handler when we shut down an event device diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 118a3b3b3f9a..877dbedc3118 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -27,7 +27,7 @@ * timer stops in C3 state. */ -struct tick_device tick_broadcast_device; +static struct tick_device tick_broadcast_device; /* FIXME: Use cpumask_var_t. */ static DECLARE_BITMAP(tick_broadcast_mask, NR_CPUS); static DECLARE_BITMAP(tmpmask, NR_CPUS); |