X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=include%2Fasm-powerpc%2Ftime.h;h=fa331dad97cbeb6d1eab619c1114e605bd00dd72;hb=ab3e975e7c8b5efb452bdb0d06c1cb7399f83979;hp=d7f5ddfbaac77f5f69c32643a6ef1691bb6e7820;hpb=492559af235eb56884d62553f191c0b5c4def990;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index d7f5ddfbaac7..fa331dad97cb 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -149,6 +149,11 @@ static inline u64 get_tb(void)
 }
 #endif /* !CONFIG_PPC64 */
 
+static inline u64 get_tb_or_rtc(void)
+{
+	return __USE_RTC() ? get_rtc() : get_tb();
+}
+
 static inline void set_tb(unsigned int upper, unsigned int lower)
 {
 	mtspr(SPRN_TBWL, 0);
@@ -174,7 +179,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