projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6906e33
)
arm/mach-clps711x: Switch do_timer() to xtime_update()
author
Torben Hohn
<
[email protected]
>
Thu, 27 Jan 2011 14:59:26 +0000
(15:59 +0100)
committer
Thomas Gleixner
<
[email protected]
>
Mon, 31 Jan 2011 13:55:44 +0000
(14:55 +0100)
do_timer() requires holding the xtime_lock, which this
code did not do. Use the safe version xtime_update()
Signed-off-by: Torben Hohn <
[email protected]
>
Cc: Russell King <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Cc:
[email protected]
LKML-Reference: <
20110127145926
.23248.56369.stgit@localhost>
Signed-off-by: Thomas Gleixner <
[email protected]
>
arch/arm/mach-clps711x/include/mach/time.h
patch
|
blob
|
history
diff --git
a/arch/arm/mach-clps711x/include/mach/time.h
b/arch/arm/mach-clps711x/include/mach/time.h
index 8fe283ccd1f3dc75aa64d20466649f1aa052156b..61fef9129c6a09ecc33284665146414efede2e66 100644
(file)
--- a/
arch/arm/mach-clps711x/include/mach/time.h
+++ b/
arch/arm/mach-clps711x/include/mach/time.h
@@
-30,7
+30,7
@@
p720t_timer_interrupt(int irq, void *dev_id)
{
struct pt_regs *regs = get_irq_regs();
do_leds();
-
do_timer
(1);
+
xtime_update
(1);
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif