Commit afab07c0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by John Stultz
Browse files

timekeeping: Use ktime_t based data for ktime_get_clocktai() 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent b82c817e

include/linux/timekeeping.h

+8 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,6 @@ enum tk_offsets { 
extern ktime_t ktime_get(void);

extern ktime_t ktime_get(void);

extern ktime_t ktime_get_with_offset(enum tk_offsets offs);

extern ktime_t ktime_get_with_offset(enum tk_offsets offs);

extern ktime_t ktime_get_monotonic_offset(void);

extern ktime_t ktime_get_monotonic_offset(void);

extern ktime_t ktime_get_clocktai(void);





/**

/**

 * ktime_get_real - get the real (wall-) time in ktime_t format

 * ktime_get_real - get the real (wall-) time in ktime_t format
@@ -130,6 +129,14 @@ static inline ktime_t ktime_get_boottime(void) 
	return ktime_get_with_offset(TK_OFFS_BOOT);

	return ktime_get_with_offset(TK_OFFS_BOOT);

}

}





/**

 * ktime_get_clocktai - Returns the TAI time of day in ktime_t format

 */

static inline ktime_t ktime_get_clocktai(void)

{

	return ktime_get_with_offset(TK_OFFS_TAI);

}



/*

/*

 * RTC specific

 * RTC specific

 */

 */

kernel/time/timekeeping.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -512,21 +512,6 @@ void timekeeping_clocktai(struct timespec *ts) 
}

}

EXPORT_SYMBOL(timekeeping_clocktai);

EXPORT_SYMBOL(timekeeping_clocktai);







/**

 * ktime_get_clocktai - Returns the TAI time of day in a ktime

 *

 * Returns the time of day in a ktime.

 */

ktime_t ktime_get_clocktai(void)

{

	struct timespec ts;



	timekeeping_clocktai(&ts);

	return timespec_to_ktime(ts);

}

EXPORT_SYMBOL(ktime_get_clocktai);



#ifdef CONFIG_NTP_PPS

#ifdef CONFIG_NTP_PPS





/**

/**