diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-06-20 08:13:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-20 08:13:39 -0700 |
| commit | 660a73583d38e35da377963eaa7657104ed758c1 (patch) | |
| tree | f2fb3b2afe18b7897f40bb844986c3496116335f /kernel/timer.c | |
| parent | b3cc42df5364fbd1bbb888f65d5aa6b1683520d9 (diff) | |
[PATCH] revert adjtimex changes
From: John Stultz, George Anzinger, Eric Piel
There was confusion over the definition of TICK_USEC. TICK_USEC is
supposed to be based on USER_HZ, however a recent change caused TICK_USEC
to be based on HZ. This broke the adjtimex() interface on systems where
USER_HZ != HZ. This patch reverts the change to TICK_USEC, removes an
added mis-use of the value and fixes some incorrect comments that could
lead to this sort of confusion.
Also this patch resolves the related LTP adjtimex failures.
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 5136630693b4..ad3758c663d4 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -439,8 +439,8 @@ repeat: /* * Timekeeping variables */ -unsigned long tick_usec = TICK_USEC; /* ACTHZ period (usec) */ -unsigned long tick_nsec = TICK_NSEC; /* USER_HZ period (nsec) */ +unsigned long tick_usec = TICK_USEC; /* USER_HZ period (usec) */ +unsigned long tick_nsec = TICK_NSEC; /* ACTHZ period (nsec) */ /* * The current time |