These changes are the raw update to linux-4.4.6-rt14. Kernel sources

are taken from kernel.org, and rt patch from the rt wiki download page.

During the rebasing, the following patch collided:

Force tick interrupt and get rid of softirq magic(I70131fb85).

Collisions have been removed because its logic was found on the
source already.

Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>

1 files changed, 0 insertions, 49 deletions

diff --git a/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
index 5de6da085..2c7ec2d28 100644
--- a/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
+++ b/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
@@ -68,55 +68,6 @@ static inline unsigned long cfs_time_shift(int seconds)
 	return cfs_time_add(cfs_time_current(), cfs_time_seconds(seconds));
 }
 
-static inline long cfs_timeval_sub(struct timeval *large, struct timeval *small,
-				   struct timeval *result)
-{
-	long r = (long)(
-		(large->tv_sec - small->tv_sec) * ONE_MILLION +
-		(large->tv_usec - small->tv_usec));
-	if (result != NULL) {
-		result->tv_usec = r % ONE_MILLION;
-		result->tv_sec = r / ONE_MILLION;
-	}
-	return r;
-}
-
-static inline void cfs_slow_warning(unsigned long now, int seconds, char *msg)
-{
-	if (cfs_time_after(cfs_time_current(),
-			   cfs_time_add(now, cfs_time_seconds(15))))
-		CERROR("slow %s "CFS_TIME_T" sec\n", msg,
-		       cfs_duration_sec(cfs_time_sub(cfs_time_current(), now)));
-}
-
-#define CFS_RATELIMIT(seconds)				  \
-({							      \
-	/*						      \
-	 * XXX nikita: non-portable initializer		 \
-	 */						     \
-	static time_t __next_message;		       \
-	int result;					     \
-								\
-	if (cfs_time_after(cfs_time_current(), __next_message)) \
-		result = 1;				     \
-	else {						  \
-		__next_message = cfs_time_shift(seconds);       \
-		result = 0;				     \
-	}						       \
-	result;						 \
-})
-
-/*
- * helper function similar to do_gettimeofday() of Linux kernel
- */
-static inline void cfs_fs_timeval(struct timeval *tv)
-{
-	struct timespec time;
-
-	cfs_fs_time_current(&time);
-	cfs_fs_time_usec(&time, tv);
-}
-
 /*
  * return valid time-out based on user supplied one. Currently we only check
  * that time-out is not shorted than allowed.