Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286900
b: refs/heads/master
c: c214455
h: refs/heads/master
v: v3
  • Loading branch information
Marc Zyngier authored and Russell King committed Jan 23, 2012
1 parent 9a5795d commit e74777d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 612539e81f655f6ac73c7af1da8701c1ee618aee
refs/heads/master: c214455f3205fa20819da6d67a8b20609ff786e7
2 changes: 2 additions & 0 deletions trunk/arch/arm/kernel/smp_twd.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
else
twd_calibrate_rate();

__raw_writel(0, twd_base + TWD_TIMER_CONTROL);

clk->name = "local_timer";
clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
CLOCK_EVT_FEAT_C3STOP;
Expand Down

0 comments on commit e74777d

Please sign in to comment.