[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-d12b0e24c56c6fb2398609f26858e5278d688840@git.kernel.org>
Date: Mon, 31 Jan 2011 14:11:00 GMT
From: tip-bot for Torben Hohn <torbenh@....de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
torbenh@....de, peterz@...radead.org, chris@...kel.net,
tglx@...utronix.de
Subject: [tip:timers/core] xtensa: Switch do_timer() to xtime_update()
Commit-ID: d12b0e24c56c6fb2398609f26858e5278d688840
Gitweb: http://git.kernel.org/tip/d12b0e24c56c6fb2398609f26858e5278d688840
Author: Torben Hohn <torbenh@....de>
AuthorDate: Thu, 27 Jan 2011 16:00:27 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Mon, 31 Jan 2011 14:55:46 +0100
xtensa: Switch do_timer() to xtime_update()
xtime_update() takes the xtime_lock itself.
set_linux_timer() does not need to be protected by xtime_lock.
[ tglx: This code is broken on SMP anyway. ]
Signed-off-by: Torben Hohn <torbenh@....de>
Cc: Chris Zankel <chris@...kel.net>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: johnstul@...ibm.com
Cc: hch@...radead.org
Cc: yong.zhang0@...il.com
LKML-Reference: <20110127150027.23248.61798.stgit@...alhost>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/xtensa/kernel/time.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 19df764..f3e5eb4 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -96,16 +96,12 @@ again:
update_process_times(user_mode(get_irq_regs()));
#endif
- write_seqlock(&xtime_lock);
-
- do_timer(1); /* Linux handler in kernel/timer.c */
+ xtime_update(1); /* Linux handler in kernel/time/timekeeping */
/* Note that writing CCOMPARE clears the interrupt. */
next += CCOUNT_PER_JIFFY;
set_linux_timer(next);
-
- write_sequnlock(&xtime_lock);
}
/* Allow platform to do something useful (Wdog). */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists