Prev: [patch 106/123] sunrpc: remove unnecessary svc_xprt_put
Next: [patch 117/123] KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
From: tip-bot for John Stultz on 12 Mar 2010 19:30
Commit-ID: ffbcad49e79cd82428010b44a87401446ea7f370
Gitweb: http://git.kernel.org/tip/ffbcad49e79cd82428010b44a87401446ea7f370
Author: John Stultz <johnstul(a)us.ibm.com>
AuthorDate: Wed, 3 Mar 2010 19:57:26 -0800
Committer: Thomas Gleixner <tglx(a)linutronix.de>
CommitDate: Sat, 13 Mar 2010 01:14:13 +0100

m68k: Convert m68k to use read/update_persistent_clock

This patch converts the m68k architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.

I have not built or tested this patch, so help from arch maintainers
would be appreciated.

Signed-off-by: John Stultz <johnstul(a)us.ibm.com>
Cc: Geert Uytterhoeven <geert(a)linux-m68k.org>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
LKML-Reference: <1267675049-12337-12-git-send-email-johnstul(a)us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
---
arch/m68k/kernel/time.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 17dc2a3..4926b38 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -73,21 +73,24 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)
return IRQ_HANDLED;
}

-void __init time_init(void)
+void read_persistent_clock(struct timespec *ts)
{
struct rtc_time time;
+ ts->tv_sec = 0;
+ ts->tv_nsec = 0;

if (mach_hwclk) {
mach_hwclk(0, &time);

if ((time.tm_year += 1900) < 1970)
time.tm_year += 100;
- xtime.tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
+ ts->tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
time.tm_hour, time.tm_min, time.tm_sec);
- xtime.tv_nsec = 0;
}
- wall_to_monotonic.tv_sec = -xtime.tv_sec;
+}

+void __init time_init(void)
+{
mach_sched_init(timer_interrupt);
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 106/123] sunrpc: remove unnecessary svc_xprt_put
Next: [patch 117/123] KVM: x86 emulator: Forbid modifying CS segment register by mov instruction