Commit 751addac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: remove obsolete jiffies conversion functions 



Now that the last user of timespec_to_jiffies() is gone, these
can just be removed, everything else is using ktime_t or timespec64
already.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6e31ded6

include/linux/jiffies.h

+0 −20
Original line number Diff line number Diff line
@@ -422,26 +422,6 @@ static __always_inline unsigned long usecs_to_jiffies(const unsigned int u) 
extern unsigned long timespec64_to_jiffies(const struct timespec64 *value);

extern void jiffies_to_timespec64(const unsigned long jiffies,

				  struct timespec64 *value);

static inline unsigned long timespec_to_jiffies(const struct timespec *value)

{

	struct timespec64 ts = timespec_to_timespec64(*value);



	return timespec64_to_jiffies(&ts);

}



static inline void jiffies_to_timespec(const unsigned long jiffies,

				       struct timespec *value)

{

	struct timespec64 ts;



	jiffies_to_timespec64(jiffies, &ts);

	*value = timespec64_to_timespec(ts);

}



extern unsigned long timeval_to_jiffies(const struct timeval *value);

extern void jiffies_to_timeval(const unsigned long jiffies,

			       struct timeval *value);



extern clock_t jiffies_to_clock_t(unsigned long x);

static inline clock_t jiffies_delta_to_clock_t(long delta)

{

kernel/time/time.c

+5 −53
Original line number Diff line number Diff line
@@ -626,10 +626,12 @@ EXPORT_SYMBOL(__usecs_to_jiffies); 
 * The >> (NSEC_JIFFIE_SC - SEC_JIFFIE_SC) converts the scaled nsec

 * value to a scaled second value.

 */

static unsigned long

__timespec64_to_jiffies(u64 sec, long nsec)



unsigned long

timespec64_to_jiffies(const struct timespec64 *value)

{

	nsec = nsec + TICK_NSEC - 1;

	u64 sec = value->tv_sec;

	long nsec = value->tv_nsec + TICK_NSEC - 1;



	if (sec >= MAX_SEC_IN_JIFFIES){

		sec = MAX_SEC_IN_JIFFIES;
@@ -640,18 +642,6 @@ __timespec64_to_jiffies(u64 sec, long nsec) 
		 (NSEC_JIFFIE_SC - SEC_JIFFIE_SC))) >> SEC_JIFFIE_SC;



}



static unsigned long

__timespec_to_jiffies(unsigned long sec, long nsec)

{

	return __timespec64_to_jiffies((u64)sec, nsec);

}



unsigned long

timespec64_to_jiffies(const struct timespec64 *value)

{

	return __timespec64_to_jiffies(value->tv_sec, value->tv_nsec);

}

EXPORT_SYMBOL(timespec64_to_jiffies);



void
@@ -668,44 +658,6 @@ jiffies_to_timespec64(const unsigned long jiffies, struct timespec64 *value) 
}

EXPORT_SYMBOL(jiffies_to_timespec64);



/*

 * We could use a similar algorithm to timespec_to_jiffies (with a

 * different multiplier for usec instead of nsec). But this has a

 * problem with rounding: we can't exactly add TICK_NSEC - 1 to the

 * usec value, since it's not necessarily integral.

 *

 * We could instead round in the intermediate scaled representation

 * (i.e. in units of 1/2^(large scale) jiffies) but that's also

 * perilous: the scaling introduces a small positive error, which

 * combined with a division-rounding-upward (i.e. adding 2^(scale) - 1

 * units to the intermediate before shifting) leads to accidental

 * overflow and overestimates.

 *

 * At the cost of one additional multiplication by a constant, just

 * use the timespec implementation.

 */

unsigned long

timeval_to_jiffies(const struct timeval *value)

{

	return __timespec_to_jiffies(value->tv_sec,

				     value->tv_usec * NSEC_PER_USEC);

}

EXPORT_SYMBOL(timeval_to_jiffies);



void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value)

{

	/*

	 * Convert jiffies to nanoseconds and separate with

	 * one divide.

	 */

	u32 rem;



	value->tv_sec = div_u64_rem((u64)jiffies * TICK_NSEC,

				    NSEC_PER_SEC, &rem);

	value->tv_usec = rem / NSEC_PER_USEC;

}

EXPORT_SYMBOL(jiffies_to_timeval);



/*

 * Convert jiffies/jiffies_64 to clock_t and back.

 */