diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /arch/i386/kernel/time.c | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'arch/i386/kernel/time.c')
| -rw-r--r-- | arch/i386/kernel/time.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 84e20b225..b4a7753b8 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -615,6 +615,8 @@ bad_ctc: void __init time_init(void) { + extern int x86_udelay_tsc; + xtime.tv_sec = get_cmos_time(); xtime.tv_usec = 0; @@ -650,6 +652,11 @@ void __init time_init(void) if (tsc_quotient) { fast_gettimeoffset_quotient = tsc_quotient; use_tsc = 1; + /* + * We could be more selective here I suspect + * and just enable this for the next intel chips ? + */ + x86_udelay_tsc = 1; #ifndef do_gettimeoffset do_gettimeoffset = do_fast_gettimeoffset; #endif |