git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
tsc.c
diff --git
a/arch/i386/kernel/tsc.c
b/arch/i386/kernel/tsc.c
index
b8fa0a8
..
1bbe45d
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"
@@
-217,7
+216,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;
@@
-306,7
+305,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)
@@
-349,8
+348,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;
}
@@
-461,7
+460,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;