Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / include / linux / time.h

diff --git a/include/linux/time.h b/include/linux/time.h
index 27d83fd2ae6146a615fec51f9fa01660f86fa13d..0760a4f5a15cae2eaa4bafd79cefadbb3cc4f05e 100644 (file)
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -35,10 +35,11 @@ extern time64_t mktime64(const unsigned int year, const unsigned int mon,
 extern u32 (*arch_gettimeoffset)(void);
 #endif
 
-struct itimerval;
-extern int do_setitimer(int which, struct itimerval *value,
-                       struct itimerval *ovalue);
-extern int do_getitimer(int which, struct itimerval *value);
+#ifdef CONFIG_POSIX_TIMERS
+extern void clear_itimer(void);
+#else
+static inline void clear_itimer(void) {}
+#endif
 
 extern long do_utimes(int dfd, const char __user *filename, struct timespec64 *times, int flags);