summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/time.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-09-20 02:09:27 +0200
committerPaul Mackerras <paulus@samba.org>2007-09-20 02:09:27 +0200
commit0ce49a3945474fc942ec37c0c0efece60f592f80 (patch)
treef42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /include/asm-powerpc/time.h
parent[POWERPC] FWNMI is only used on pSeries (diff)
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.xz
linux-0ce49a3945474fc942ec37c0c0efece60f592f80.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-powerpc/time.h')
-rw-r--r--include/asm-powerpc/time.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index fdc271ebe41c..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);