Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116083
b: refs/heads/master
c: 53c01d2
h: refs/heads/master
i:
  116081: 8a13bd6
  116079: 8b7dd03
v: v3
  • Loading branch information
Paul Mundt committed Sep 8, 2008
1 parent 93e8505 commit 0223375
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 71f0bdcab69ab36b1e939d36063aaf6c4a164ed3
refs/heads/master: 53c01d2dc38cd3cfaf5591ec5c6c9c4e437cfec2
7 changes: 4 additions & 3 deletions trunk/arch/sh/kernel/time_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,16 +254,17 @@ void __init time_init(void)
set_normalized_timespec(&wall_to_monotonic,
-xtime.tv_sec, -xtime.tv_nsec);

#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
local_timer_setup(smp_processor_id());
#endif

/*
* Find the timer to use as the system timer, it will be
* initialized for us.
*/
sys_timer = get_sys_timer();
printk(KERN_INFO "Using %s for system timer\n", sys_timer->name);

#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
local_timer_setup(smp_processor_id());
#endif

if (sys_timer->ops->read)
clocksource_sh.read = sys_timer->ops->read;
Expand Down

0 comments on commit 0223375

Please sign in to comment.