From e68d87c288a87dbd8a72ba4eb34142a52123b573 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 18 Mar 2010 20:19:28 -0700 Subject: [PATCH] --- yaml --- r: 192246 b: refs/heads/master c: 3d0205bd1383aa3cac93c209b7c7d03b27930195 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/timex.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 915b5d04ccd0..d68a4d263872 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1292ba164742e3a236e407148e00300b7196906 +refs/heads/master: 3d0205bd1383aa3cac93c209b7c7d03b27930195 diff --git a/trunk/include/linux/timex.h b/trunk/include/linux/timex.h index e2de51eedf05..32d852f8cbe4 100644 --- a/trunk/include/linux/timex.h +++ b/trunk/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 */