diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/net/hamradio/soundmodem | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/net/hamradio/soundmodem')
| -rw-r--r-- | drivers/net/hamradio/soundmodem/sm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/hamradio/soundmodem/sm.h b/drivers/net/hamradio/soundmodem/sm.h index 4608b3650..24a586740 100644 --- a/drivers/net/hamradio/soundmodem/sm.h +++ b/drivers/net/hamradio/soundmodem/sm.h @@ -299,8 +299,6 @@ extern inline unsigned int lcm(unsigned int x, unsigned int y) #ifdef __i386__ -#define HAS_RDTSC (current_cpu_data.x86_capability & X86_FEATURE_TSC) - /* * only do 32bit cycle counter arithmetic; we hope we won't overflow. * in fact, overflowing modems would require over 2THz CPU clock speeds :-) @@ -308,7 +306,7 @@ extern inline unsigned int lcm(unsigned int x, unsigned int y) #define time_exec(var,cmd) \ ({ \ - if (HAS_RDTSC) { \ + if (cpu_has_tsc) { \ unsigned int cnt1, cnt2, cnt3; \ __asm__(".byte 0x0f,0x31" : "=a" (cnt1), "=d" (cnt3)); \ cmd; \ |