diff options
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r-- | kernel/posix-timers.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index df629d853a81..af936fd37140 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -253,11 +253,11 @@ static __init int init_posix_timers(void) | |||
253 | .clock_get = posix_get_monotonic_coarse, | 253 | .clock_get = posix_get_monotonic_coarse, |
254 | }; | 254 | }; |
255 | 255 | ||
256 | register_posix_clock(CLOCK_REALTIME, &clock_realtime); | 256 | posix_timers_register_clock(CLOCK_REALTIME, &clock_realtime); |
257 | register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic); | 257 | posix_timers_register_clock(CLOCK_MONOTONIC, &clock_monotonic); |
258 | register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw); | 258 | posix_timers_register_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw); |
259 | register_posix_clock(CLOCK_REALTIME_COARSE, &clock_realtime_coarse); | 259 | posix_timers_register_clock(CLOCK_REALTIME_COARSE, &clock_realtime_coarse); |
260 | register_posix_clock(CLOCK_MONOTONIC_COARSE, &clock_monotonic_coarse); | 260 | posix_timers_register_clock(CLOCK_MONOTONIC_COARSE, &clock_monotonic_coarse); |
261 | 261 | ||
262 | posix_timers_cache = kmem_cache_create("posix_timers_cache", | 262 | posix_timers_cache = kmem_cache_create("posix_timers_cache", |
263 | sizeof (struct k_itimer), 0, SLAB_PANIC, | 263 | sizeof (struct k_itimer), 0, SLAB_PANIC, |
@@ -433,7 +433,8 @@ static struct pid *good_sigevent(sigevent_t * event) | |||
433 | return task_pid(rtn); | 433 | return task_pid(rtn); |
434 | } | 434 | } |
435 | 435 | ||
436 | void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock) | 436 | void posix_timers_register_clock(const clockid_t clock_id, |
437 | struct k_clock *new_clock) | ||
437 | { | 438 | { |
438 | if ((unsigned) clock_id >= MAX_CLOCKS) { | 439 | if ((unsigned) clock_id >= MAX_CLOCKS) { |
439 | printk(KERN_WARNING "POSIX clock register failed for clock_id %d\n", | 440 | printk(KERN_WARNING "POSIX clock register failed for clock_id %d\n", |
@@ -454,7 +455,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock) | |||
454 | 455 | ||
455 | posix_clocks[clock_id] = *new_clock; | 456 | posix_clocks[clock_id] = *new_clock; |
456 | } | 457 | } |
457 | EXPORT_SYMBOL_GPL(register_posix_clock); | 458 | EXPORT_SYMBOL_GPL(posix_timers_register_clock); |
458 | 459 | ||
459 | static struct k_itimer * alloc_posix_timer(void) | 460 | static struct k_itimer * alloc_posix_timer(void) |
460 | { | 461 | { |