Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 72cf498..8dd2e2b 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -57,8 +57,6 @@ BUILD_ASSERT_DECL(TYPE_IS_SIGNED(time_t));
 #endif
 #endif /* ifndef CACHE_TIME */
 
-void time_disable_restart(void);
-void time_enable_restart(void);
 void time_postfork(void);
 void time_refresh(void);
 time_t time_now(void);
@@ -70,15 +68,14 @@ void time_wall_timespec(struct timespec *);
 void time_alarm(unsigned int secs);
 int time_poll(struct pollfd *, int n_pollfds, long long int timeout_when,
               int *elapsed);
-bool time_cached(void);
 
 long long int timespec_to_msec(const struct timespec *);
 long long int timeval_to_msec(const struct timeval *);
 
 void xgettimeofday(struct timeval *);
+void xclock_gettime(clock_t, struct timespec *);
 
 int get_cpu_usage(void);
-void format_backtraces(struct ds *, size_t min_count);
 
 long long int time_boot_msec(void);