From e4bfbac7ba5c87a6e5f313d731420115341d5263 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 20 Aug 2007 07:29:11 -0500 Subject: [PATCH] --- yaml --- r: 67237 b: refs/heads/master c: aab69292e4efd38181cd300d9b83b12592643d6c h: refs/heads/master i: 67235: 39b388b39afe702e81855fa3899c4dc0c387ab5b v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 2 +- trunk/include/asm-powerpc/time.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5c49250abd6e..6ed29c8c45e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d922c8dc332f4c7bc156fa832187661d4899cee +refs/heads/master: aab69292e4efd38181cd300d9b83b12592643d6c diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index c85d9b0d9042..b5944d8e3802 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -866,7 +866,7 @@ void __init generic_calibrate_decr(void) "(not found)\n"); } -#ifdef CONFIG_BOOKE +#if defined(CONFIG_BOOKE) || defined(CONFIG_40x) /* Set the time base to zero */ mtspr(SPRN_TBWL, 0); mtspr(SPRN_TBWU, 0); diff --git a/trunk/include/asm-powerpc/time.h b/trunk/include/asm-powerpc/time.h index d7f5ddfbaac7..fdc271ebe41c 100644 --- a/trunk/include/asm-powerpc/time.h +++ b/trunk/include/asm-powerpc/time.h @@ -174,7 +174,7 @@ static inline unsigned int get_dec(void) static inline void set_dec(int val) { #if defined(CONFIG_40x) - return; /* Have to let it auto-reload */ + mtspr(SPRN_PIT, val); #elif defined(CONFIG_8xx_CPU6) set_dec_cpu6(val); #else