projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
clocksource
/
arc_timer.c
diff --git
a/drivers/clocksource/arc_timer.c
b/drivers/clocksource/arc_timer.c
index 3ea46343024f8fea4b64728c6985210bd8331e20..7517f959cba762e484cdc1fb00a78cb95aee5fe0 100644
(file)
--- a/
drivers/clocksource/arc_timer.c
+++ b/
drivers/clocksource/arc_timer.c
@@
-309,7
+309,7
@@
static int __init arc_clockevent_setup(struct device_node *node)
}
ret = cpuhp_setup_state(CPUHP_AP_ARC_TIMER_STARTING,
- "
AP_ARC_TIMER_STARTING
",
+ "
clockevents/arc/timer:starting
",
arc_timer_starting_cpu,
arc_timer_dying_cpu);
if (ret) {