diff options
author | H. Peter Anvin <hpa@zytor.com> | 2007-05-09 03:02:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:49:33 -0400 |
commit | 29bd44337799e4cb85aec5157a9c88a0da66642a (patch) | |
tree | 454124f8ce577a814fde5edc08b26cdf1138f122 | |
parent | 21c42bd8db2acd7c884d132efbf7aee9ca970b06 (diff) |
i386: remove unused rdtsc() macro
All users to the two-part rdtsc() macro have already switched to using
rdtscl() or rdtscll(). Remove the now-obsolete macro.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-i386/msr.h | 7 | ||||
-rw-r--r-- | include/asm-i386/paravirt.h | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h index 26861df52cc4..c70773e2ff94 100644 --- a/include/asm-i386/msr.h +++ b/include/asm-i386/msr.h | |||
@@ -121,13 +121,6 @@ static inline void wrmsrl (unsigned long msr, unsigned long long val) | |||
121 | __err; \ | 121 | __err; \ |
122 | }) | 122 | }) |
123 | 123 | ||
124 | #define rdtsc(low,high) \ | ||
125 | do { \ | ||
126 | u64 _l = native_read_tsc(); \ | ||
127 | (low) = (u32)_l; \ | ||
128 | (high) = _l >> 32; \ | ||
129 | } while(0) | ||
130 | |||
131 | #define rdtscl(low) \ | 124 | #define rdtscl(low) \ |
132 | do { \ | 125 | do { \ |
133 | (low) = native_read_tsc(); \ | 126 | (low) = native_read_tsc(); \ |
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h index e2e7f98723c5..bc5c12c13581 100644 --- a/include/asm-i386/paravirt.h +++ b/include/asm-i386/paravirt.h | |||
@@ -560,11 +560,6 @@ static inline u64 paravirt_read_tsc(void) | |||
560 | { | 560 | { |
561 | return PVOP_CALL0(u64, read_tsc); | 561 | return PVOP_CALL0(u64, read_tsc); |
562 | } | 562 | } |
563 | #define rdtsc(low,high) do { \ | ||
564 | u64 _l = paravirt_read_tsc(); \ | ||
565 | low = (u32)_l; \ | ||
566 | high = _l >> 32; \ | ||
567 | } while(0) | ||
568 | 563 | ||
569 | #define rdtscl(low) do { \ | 564 | #define rdtscl(low) do { \ |
570 | u64 _l = paravirt_read_tsc(); \ | 565 | u64 _l = paravirt_read_tsc(); \ |