diff options
Diffstat (limited to 'kernel/time.c')
-rw-r--r-- | kernel/time.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/kernel/time.c b/kernel/time.c index 55337a816b20..8e8dc6d705c9 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
@@ -150,7 +150,7 @@ static inline void warp_clock(void) | |||
150 | * various programs will get confused when the clock gets warped. | 150 | * various programs will get confused when the clock gets warped. |
151 | */ | 151 | */ |
152 | 152 | ||
153 | int do_sys_settimeofday(struct timespec *tv, struct timezone *tz) | 153 | int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz) |
154 | { | 154 | { |
155 | static int firsttime = 1; | 155 | static int firsttime = 1; |
156 | int error = 0; | 156 | int error = 0; |
@@ -674,7 +674,6 @@ u64 nsecs_to_jiffies64(u64 n) | |||
674 | #endif | 674 | #endif |
675 | } | 675 | } |
676 | 676 | ||
677 | |||
678 | /** | 677 | /** |
679 | * nsecs_to_jiffies - Convert nsecs in u64 to jiffies | 678 | * nsecs_to_jiffies - Convert nsecs in u64 to jiffies |
680 | * | 679 | * |
@@ -693,23 +692,6 @@ unsigned long nsecs_to_jiffies(u64 n) | |||
693 | return (unsigned long)nsecs_to_jiffies64(n); | 692 | return (unsigned long)nsecs_to_jiffies64(n); |
694 | } | 693 | } |
695 | 694 | ||
696 | #if (BITS_PER_LONG < 64) | ||
697 | u64 get_jiffies_64(void) | ||
698 | { | ||
699 | unsigned long seq; | ||
700 | u64 ret; | ||
701 | |||
702 | do { | ||
703 | seq = read_seqbegin(&xtime_lock); | ||
704 | ret = jiffies_64; | ||
705 | } while (read_seqretry(&xtime_lock, seq)); | ||
706 | return ret; | ||
707 | } | ||
708 | EXPORT_SYMBOL(get_jiffies_64); | ||
709 | #endif | ||
710 | |||
711 | EXPORT_SYMBOL(jiffies); | ||
712 | |||
713 | /* | 695 | /* |
714 | * Add two timespec values and do a safety check for overflow. | 696 | * Add two timespec values and do a safety check for overflow. |
715 | * It's assumed that both values are valid (>= 0) | 697 | * It's assumed that both values are valid (>= 0) |