aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-04-24 22:54:24 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-05-08 06:51:36 -0400
commit9141d30a480850d989fc245909b98670a7b66ec1 (patch)
tree22c2d05858ac110e25135e0fb89b6eb9f3bc3bd4 /arch/sh
parent1a013e2ffc1154ce8ee7076385d83c574066d83c (diff)
sh64: fixups for xtime_lock seqlock conversion.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/time_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c
index 898977ee2030..56205e36d009 100644
--- a/arch/sh/kernel/time_64.c
+++ b/arch/sh/kernel/time_64.c
@@ -240,7 +240,7 @@ static inline void do_timer_interrupt(void)
240 * the irq version of write_lock because as just said we have irq 240 * the irq version of write_lock because as just said we have irq
241 * locally disabled. -arca 241 * locally disabled. -arca
242 */ 242 */
243 write_lock(&xtime_lock); 243 write_seqlock(&xtime_lock);
244 asm ("getcon cr62, %0" : "=r" (current_ctc)); 244 asm ("getcon cr62, %0" : "=r" (current_ctc));
245 ctc_last_interrupt = (unsigned long) current_ctc; 245 ctc_last_interrupt = (unsigned long) current_ctc;
246 246
@@ -266,7 +266,7 @@ static inline void do_timer_interrupt(void)
266 /* do it again in 60 s */ 266 /* do it again in 60 s */
267 last_rtc_update = xtime.tv_sec - 600; 267 last_rtc_update = xtime.tv_sec - 600;
268 } 268 }
269 write_unlock(&xtime_lock); 269 write_sequnlock(&xtime_lock);
270 270
271#ifndef CONFIG_SMP 271#ifndef CONFIG_SMP
272 update_process_times(user_mode(get_irq_regs())); 272 update_process_times(user_mode(get_irq_regs()));