diff options
Diffstat (limited to 'arch/i386/kernel/tsc.c')
-rw-r--r-- | arch/i386/kernel/tsc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index 3082a418635c..c9c9d54c91f6 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <asm/delay.h> | 14 | #include <asm/delay.h> |
15 | #include <asm/tsc.h> | 15 | #include <asm/tsc.h> |
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/timer.h> | ||
17 | 18 | ||
18 | #include "mach_timer.h" | 19 | #include "mach_timer.h" |
19 | 20 | ||
@@ -102,9 +103,6 @@ unsigned long long sched_clock(void) | |||
102 | { | 103 | { |
103 | unsigned long long this_offset; | 104 | unsigned long long this_offset; |
104 | 105 | ||
105 | if (unlikely(custom_sched_clock)) | ||
106 | return (*custom_sched_clock)(); | ||
107 | |||
108 | /* | 106 | /* |
109 | * Fall back to jiffies if there's no TSC available: | 107 | * Fall back to jiffies if there's no TSC available: |
110 | */ | 108 | */ |
@@ -113,7 +111,7 @@ unsigned long long sched_clock(void) | |||
113 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); | 111 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); |
114 | 112 | ||
115 | /* read the Time Stamp Counter: */ | 113 | /* read the Time Stamp Counter: */ |
116 | rdtscll(this_offset); | 114 | get_scheduled_cycles(this_offset); |
117 | 115 | ||
118 | /* return the value in ns */ | 116 | /* return the value in ns */ |
119 | return cycles_2_ns(this_offset); | 117 | return cycles_2_ns(this_offset); |