lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'timers-for-linus-clockevents' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-06-15 09:58:50 -07:00
parent 3f27c0d2a4 c81fc2c331
commit f9db6e0951
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/clockevents.c
View File

@@ -54,6 +54,7 @@ unsigned long clockevent_delta2ns(unsigned long latch,
return (unsigned long) clc; return (unsigned long) clc;
} }
EXPORT_SYMBOL_GPL(clockevent_delta2ns);
/** /**
* clockevents_set_mode - set the operating mode of a clock event device * 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); spin_unlock(&clockevents_lock);
} }
EXPORT_SYMBOL_GPL(clockevents_register_device);
/* /*
* Noop handler when we shut down an event device * Noop handler when we shut down an event device

2
kernel/time/tick-broadcast.c
View File

@@ -27,7 +27,7 @@
* timer stops in C3 state. * timer stops in C3 state.
*/ */
struct tick_device tick_broadcast_device; static struct tick_device tick_broadcast_device;
/* FIXME: Use cpumask_var_t. */ /* FIXME: Use cpumask_var_t. */
static DECLARE_BITMAP(tick_broadcast_mask, NR_CPUS); static DECLARE_BITMAP(tick_broadcast_mask, NR_CPUS);
static DECLARE_BITMAP(tmpmask, NR_CPUS); static DECLARE_BITMAP(tmpmask, NR_CPUS);