From 5d3ffe6b59356b03acbfccd75773bdde7e009263 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Fri, 30 Jun 2006 01:55:56 -0700 Subject: [PATCH] --- yaml --- r: 31397 b: refs/heads/master c: 572e614750c3ed27da1ec6b75dc486066a11fffd h: refs/heads/master i: 31395: e60a752fce38bd2f9caafa2a50206d8bb38cb330 v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/time_kern.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18d797a437a7..c80c73e79ec4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6edb08620fbeeeba81ab63c7129a51cdb3acd8b3 +refs/heads/master: 572e614750c3ed27da1ec6b75dc486066a11fffd diff --git a/trunk/arch/um/kernel/time_kern.c b/trunk/arch/um/kernel/time_kern.c index 87cdbc560d36..08dd727e79e4 100644 --- a/trunk/arch/um/kernel/time_kern.c +++ b/trunk/arch/um/kernel/time_kern.c @@ -96,11 +96,15 @@ void time_init_kern(void) void do_boot_timer_handler(struct sigcontext * sc) { + unsigned long flags; struct pt_regs regs; CHOOSE_MODE((void) (UPT_SC(®s.regs) = sc), (void) (regs.regs.skas.is_user = 0)); + + write_seqlock_irqsave(&xtime_lock, flags); do_timer(®s); + write_sequnlock_irqrestore(&xtime_lock, flags); } static DEFINE_SPINLOCK(timer_spinlock); @@ -125,15 +129,17 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs) unsigned long long nsecs; unsigned long flags; + write_seqlock_irqsave(&xtime_lock, flags); + do_timer(regs); - write_seqlock_irqsave(&xtime_lock, flags); nsecs = get_time() + local_offset; xtime.tv_sec = nsecs / NSEC_PER_SEC; xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; + write_sequnlock_irqrestore(&xtime_lock, flags); - return(IRQ_HANDLED); + return IRQ_HANDLED; } long um_time(int __user *tloc)