git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
timers
/
common.c
diff --git
a/arch/i386/kernel/timers/common.c
b/arch/i386/kernel/timers/common.c
index
f7f9000
..
8163fe0
100644
(file)
--- a/
arch/i386/kernel/timers/common.c
+++ b/
arch/i386/kernel/timers/common.c
@@
-6,6
+6,7
@@
#include <linux/timex.h>
#include <linux/errno.h>
#include <linux/jiffies.h>
#include <linux/timex.h>
#include <linux/errno.h>
#include <linux/jiffies.h>
+#include <linux/module.h>
#include <asm/io.h>
#include <asm/timer.h>
#include <asm/io.h>
#include <asm/timer.h>
@@
-24,7
+25,7
@@
#define CALIBRATE_TIME (5 * 1000020/HZ)
#define CALIBRATE_TIME (5 * 1000020/HZ)
-unsigned long
__init
calibrate_tsc(void)
+unsigned long calibrate_tsc(void)
{
mach_prepare_counter();
{
mach_prepare_counter();
@@
-85,7
+86,7
@@
bad_ctc:
#define CALIBRATE_CNT_HPET (5 * hpet_tick)
#define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC)
#define CALIBRATE_CNT_HPET (5 * hpet_tick)
#define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC)
-unsigned long __init calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr)
+unsigned long __
dev
init calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr)
{
unsigned long tsc_startlow, tsc_starthigh;
unsigned long tsc_endlow, tsc_endhigh;
{
unsigned long tsc_startlow, tsc_starthigh;
unsigned long tsc_endlow, tsc_endhigh;
@@
-138,8
+139,17
@@
bad_calibration:
}
#endif
}
#endif
+
+unsigned long read_timer_tsc(void)
+{
+ unsigned long retval;
+ rdtscl(retval);
+ return retval;
+}
+
+
/* calculate cpu_khz */
/* calculate cpu_khz */
-void
__init
init_cpu_khz(void)
+void init_cpu_khz(void)
{
if (cpu_has_tsc) {
unsigned long tsc_quotient = calibrate_tsc();
{
if (cpu_has_tsc) {
unsigned long tsc_quotient = calibrate_tsc();
@@
-153,8
+163,10
@@
void __init init_cpu_khz(void)
:"=a" (cpu_khz), "=d" (edx)
:"r" (tsc_quotient),
"0" (eax), "1" (edx));
:"=a" (cpu_khz), "=d" (edx)
:"r" (tsc_quotient),
"0" (eax), "1" (edx));
- printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000);
+ printk("Detected %u.%03u MHz processor.\n",
+ cpu_khz / 1000, cpu_khz % 1000);
}
}
}
}
}
}
}
}
+