Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309179fa authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/linux into timers/core 

* Remove the deprecated setup_sched_clock() API
* Minor NTP updates
parents 2779ac16 ea54bca3

include/linux/sched_clock.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ extern void sched_clock_postinit(void); 
static inline void sched_clock_postinit(void) { }

#endif



extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);

extern void sched_clock_register(u64 (*read)(void), int bits,

				 unsigned long rate);

kernel/time/ntp.c

+10 −7
Original line number Diff line number Diff line
@@ -165,21 +165,21 @@ static inline void pps_set_freq(s64 freq) 


static inline int is_error_status(int status)

{

	return (time_status & (STA_UNSYNC|STA_CLOCKERR))

	return (status & (STA_UNSYNC|STA_CLOCKERR))

		/* PPS signal lost when either PPS time or

		 * PPS frequency synchronization requested

		 */

		|| ((time_status & (STA_PPSFREQ|STA_PPSTIME))

			&& !(time_status & STA_PPSSIGNAL))

		|| ((status & (STA_PPSFREQ|STA_PPSTIME))

			&& !(status & STA_PPSSIGNAL))

		/* PPS jitter exceeded when

		 * PPS time synchronization requested */

		|| ((time_status & (STA_PPSTIME|STA_PPSJITTER))

		|| ((status & (STA_PPSTIME|STA_PPSJITTER))

			== (STA_PPSTIME|STA_PPSJITTER))

		/* PPS wander exceeded or calibration error when

		 * PPS frequency synchronization requested

		 */

		|| ((time_status & STA_PPSFREQ)

			&& (time_status & (STA_PPSWANDER|STA_PPSERROR)));

		|| ((status & STA_PPSFREQ)

			&& (status & (STA_PPSWANDER|STA_PPSERROR)));

}



static inline void pps_fill_timex(struct timex *txc)
@@ -923,7 +923,10 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts) 


static int __init ntp_tick_adj_setup(char *str)

{

	ntp_tick_adj = simple_strtol(str, NULL, 0);

	int rc = kstrtol(str, 0, (long *)&ntp_tick_adj);



	if (rc)

		return rc;

	ntp_tick_adj <<= NTP_SCALE_SHIFT;



	return 1;

kernel/time/sched_clock.c

+0 −13
Original line number Diff line number Diff line
@@ -49,13 +49,6 @@ static u64 notrace jiffy_sched_clock_read(void) 
	return (u64)(jiffies - INITIAL_JIFFIES);

}



static u32 __read_mostly (*read_sched_clock_32)(void);



static u64 notrace read_sched_clock_32_wrapper(void)

{

	return read_sched_clock_32();

}



static u64 __read_mostly (*read_sched_clock)(void) = jiffy_sched_clock_read;



static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
@@ -176,12 +169,6 @@ void __init sched_clock_register(u64 (*read)(void), int bits, 
	pr_debug("Registered %pF as sched_clock source\n", read);

}



void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)

{

	read_sched_clock_32 = read;

	sched_clock_register(read_sched_clock_32_wrapper, bits, rate);

}



void __init sched_clock_postinit(void)

{

	/*