diff --git a/[refs] b/[refs] index 71a914981a3d..915b5d04ccd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12b8aeee3e51654fb95a3baff2e093f2513bb87d +refs/heads/master: e1292ba164742e3a236e407148e00300b7196906 diff --git a/trunk/include/linux/timex.h b/trunk/include/linux/timex.h index 7a082b32d8e1..e2de51eedf05 100644 --- a/trunk/include/linux/timex.h +++ b/trunk/include/linux/timex.h @@ -238,7 +238,6 @@ extern int tickadj; /* amount of adjustment per tick */ * phase-lock loop variables */ extern int time_status; /* clock synchronization status bits */ -extern long time_adjust; /* The amount of adjtime left */ extern void ntp_init(void); extern void ntp_clear(void); diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 7c0f180d6e9d..c63116863a80 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -69,7 +69,7 @@ static s64 time_freq; /* time at last adjustment (secs): */ static long time_reftime; -long time_adjust; +static long time_adjust; /* constant (boot-param configurable) NTP tick adjustment (upscaled) */ static s64 ntp_tick_adj;