From 95b11a90966a2b788ca90977ce5f2ba0148c1344 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 11 Nov 2007 17:33:55 +0000 Subject: [PATCH] --- yaml --- r: 73857 b: refs/heads/master c: 8dfa741f146b39eb59ef2094e03f47079ca99eb0 h: refs/heads/master i: 73855: f80fbff17128d2851a5df07d02a080cb8491a7b3 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cevt-bcm1480.c | 1 + trunk/arch/mips/kernel/cevt-sb1250.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6872609ac45e..14e0b17997f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 622477533d3dc24845c847f386533f3c0e6a1be6 +refs/heads/master: 8dfa741f146b39eb59ef2094e03f47079ca99eb0 diff --git a/trunk/arch/mips/kernel/cevt-bcm1480.c b/trunk/arch/mips/kernel/cevt-bcm1480.c index e54410e5a2cd..0a57f86945f1 100644 --- a/trunk/arch/mips/kernel/cevt-bcm1480.c +++ b/trunk/arch/mips/kernel/cevt-bcm1480.c @@ -75,6 +75,7 @@ static int sibyte_next_event(unsigned long delta, struct clock_event_device *cd) cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)); init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)); + __raw_writeq(0, cfg); __raw_writeq(delta - 1, init); __raw_writeq(M_SCD_TIMER_ENABLE, cfg); diff --git a/trunk/arch/mips/kernel/cevt-sb1250.c b/trunk/arch/mips/kernel/cevt-sb1250.c index 8fbb05537680..63ac3ad462bc 100644 --- a/trunk/arch/mips/kernel/cevt-sb1250.c +++ b/trunk/arch/mips/kernel/cevt-sb1250.c @@ -73,6 +73,7 @@ static int sibyte_next_event(unsigned long delta, struct clock_event_device *cd) cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)); init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)); + __raw_writeq(0, cfg); __raw_writeq(delta - 1, init); __raw_writeq(M_SCD_TIMER_ENABLE, cfg);