diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-09-20 10:09:27 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-20 10:09:27 +1000 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /include/asm-powerpc | |
| parent | [POWERPC] FWNMI is only used on pSeries (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-dev-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.xz linux-dev-0ce49a3945474fc942ec37c0c0efece60f592f80.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/time.h | 5 |
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); |