The patch titled ntp: remove tickadj has been added to the -mm tree. Its filename is ntp-remove-tickadj.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ntp: remove tickadj From: John Stultz <johnstul@xxxxxxxxxx> There are zero users of tickadj. So remove it. Signed-off-by: John Stultz <johnstul@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/timex.h | 4 ---- 1 file changed, 4 deletions(-) diff -puN include/linux/timex.h~ntp-remove-tickadj include/linux/timex.h --- a/include/linux/timex.h~ntp-remove-tickadj +++ a/include/linux/timex.h @@ -232,7 +232,6 @@ struct timex { */ extern unsigned long tick_usec; /* USER_HZ period (usec) */ extern unsigned long tick_nsec; /* ACTHZ period (nsec) */ -extern int tickadj; /* amount of adjustment per tick */ /* * phase-lock loop variables @@ -270,9 +269,6 @@ extern void second_overflow(void); extern void update_ntp_one_tick(void); extern int do_adjtimex(struct timex *); -/* Don't use! Compatibility define for existing users. */ -#define tickadj (500/HZ ? : 1) - int read_current_timer(unsigned long *timer_val); /* The clock frequency of the i8253/i8254 PIT */ _ Patches currently in -mm which might be from johnstul@xxxxxxxxxx are linux-next.patch cs5535-clockevt-free-timer-in-irq-setup-error-path.patch time-clean-up-warp_clock.patch time-clean-up-direct-xtime-usage-in-xen.patch ntp-make-time_adjust-static.patch ntp-remove-tickadj.patch xtensa-fix-unnecessary-setting-of-xtime.patch time-kill-off-config_generic_time.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html