diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-10 19:15:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-10 19:15:38 -0800 |
| commit | bd83dce2241887915da737dc275d2e243ee2fa68 (patch) | |
| tree | 57a6a28af861a0cb46dc844861c1ca627895e0b5 /kernel/time.c | |
| parent | faea911147c2fe5de5ef9464aa7cb14122b58d94 (diff) | |
| parent | 83586a3d2e6b9eb24cce5b9ac20d81e1aff17370 (diff) | |
Merge bk://linux-dj.bkbits.net/watchdog
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c index c8c8a10eae1f..4ecc0a3b2ac1 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -27,7 +27,6 @@ #include <linux/timex.h> #include <linux/errno.h> #include <linux/smp_lock.h> - #include <asm/uaccess.h> /* @@ -416,3 +415,17 @@ struct timespec current_kernel_time(void) return now; } + +#if (BITS_PER_LONG < 64) +u64 get_jiffies_64(void) +{ + unsigned long seq; + u64 ret; + + do { + seq = read_seqbegin(&xtime_lock); + ret = jiffies_64; + } while (read_seqretry(&xtime_lock, seq)); + return ret; +} +#endif |