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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
tsc.c
diff --git
a/arch/i386/kernel/tsc.c
b/arch/i386/kernel/tsc.c
index
650b746
..
d7e9d78
100644
(file)
--- a/
arch/i386/kernel/tsc.c
+++ b/
arch/i386/kernel/tsc.c
@@
-13,7
+13,6
@@
#include <asm/delay.h>
#include <asm/tsc.h>
#include <asm/delay.h>
#include <asm/tsc.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include "mach_timer.h"
#include <asm/io.h>
#include "mach_timer.h"
@@
-25,7
+24,7
@@
*/
unsigned int tsc_khz;
*/
unsigned int tsc_khz;
-int tsc_disable
__cpuinitdata = 0
;
+int tsc_disable;
#ifdef CONFIG_X86_TSC
static int __init tsc_setup(char *str)
#ifdef CONFIG_X86_TSC
static int __init tsc_setup(char *str)
@@
-194,7
+193,7
@@
int recalibrate_cpu_khz(void)
EXPORT_SYMBOL(recalibrate_cpu_khz);
EXPORT_SYMBOL(recalibrate_cpu_khz);
-void tsc_init(void)
+void
__init
tsc_init(void)
{
if (!cpu_has_tsc || tsc_disable)
return;
{
if (!cpu_has_tsc || tsc_disable)
return;
@@
-219,7
+218,7
@@
static unsigned int cpufreq_delayed_issched = 0;
static unsigned int cpufreq_init = 0;
static struct work_struct cpufreq_delayed_get_work;
static unsigned int cpufreq_init = 0;
static struct work_struct cpufreq_delayed_get_work;
-static void handle_cpufreq_delayed_get(
void *v
)
+static void handle_cpufreq_delayed_get(
struct work_struct *work
)
{
unsigned int cpu;
{
unsigned int cpu;
@@
-308,7
+307,7
@@
static int __init cpufreq_tsc(void)
{
int ret;
{
int ret;
- INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get
, NULL
);
+ INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get);
ret = cpufreq_register_notifier(&time_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
if (!ret)
ret = cpufreq_register_notifier(&time_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
if (!ret)
@@
-351,8
+350,8
@@
static int tsc_update_callback(void)
int change = 0;
/* check to see if we should switch to the safe clocksource: */
int change = 0;
/* check to see if we should switch to the safe clocksource: */
- if (clocksource_tsc.rating !=
5
0 && check_tsc_unstable()) {
- clocksource_tsc.rating =
5
0;
+ if (clocksource_tsc.rating != 0 && check_tsc_unstable()) {
+ clocksource_tsc.rating = 0;
clocksource_reselect();
change = 1;
}
clocksource_reselect();
change = 1;
}
@@
-463,7
+462,7
@@
static int __init init_tsc_clocksource(void)
clocksource_tsc.shift);
/* lower the rating if we already know its unstable: */
if (check_tsc_unstable())
clocksource_tsc.shift);
/* lower the rating if we already know its unstable: */
if (check_tsc_unstable())
- clocksource_tsc.rating =
5
0;
+ clocksource_tsc.rating = 0;
init_timer(&verify_tsc_freq_timer);
verify_tsc_freq_timer.function = verify_tsc_freq;
init_timer(&verify_tsc_freq_timer);
verify_tsc_freq_timer.function = verify_tsc_freq;