diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-16 04:27:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:13:57 -0500 |
| commit | 26a08eb301a2e3fce5a501e3dd26cf3ec46591d7 (patch) | |
| tree | e0c27848a9d5caf3bee200dc6ef863f47aff1d6a | |
| parent | c1d370e167d66b10bca3b602d3740405469383de (diff) | |
[PATCH] i386 Remove useless code in tsc.c
The delayed work code in arch/i386/kernel/tsc.c is an unused leftover of the
GTOD conversion. Remove it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/i386/kernel/tsc.c | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index 46f752a8bbf3..d4000649942a 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c | |||
| @@ -222,34 +222,6 @@ out_no_tsc: | |||
| 222 | 222 | ||
| 223 | #ifdef CONFIG_CPU_FREQ | 223 | #ifdef CONFIG_CPU_FREQ |
| 224 | 224 | ||
| 225 | static unsigned int cpufreq_delayed_issched = 0; | ||
| 226 | static unsigned int cpufreq_init = 0; | ||
| 227 | static struct work_struct cpufreq_delayed_get_work; | ||
| 228 | |||
| 229 | static void handle_cpufreq_delayed_get(struct work_struct *work) | ||
| 230 | { | ||
| 231 | unsigned int cpu; | ||
| 232 | |||
| 233 | for_each_online_cpu(cpu) | ||
| 234 | cpufreq_get(cpu); | ||
| 235 | |||
| 236 | cpufreq_delayed_issched = 0; | ||
| 237 | } | ||
| 238 | |||
| 239 | /* | ||
| 240 | * if we notice cpufreq oddness, schedule a call to cpufreq_get() as it tries | ||
| 241 | * to verify the CPU frequency the timing core thinks the CPU is running | ||
| 242 | * at is still correct. | ||
| 243 | */ | ||
| 244 | static inline void cpufreq_delayed_get(void) | ||
| 245 | { | ||
| 246 | if (cpufreq_init && !cpufreq_delayed_issched) { | ||
| 247 | cpufreq_delayed_issched = 1; | ||
| 248 | printk(KERN_DEBUG "Checking if CPU frequency changed.\n"); | ||
| 249 | schedule_work(&cpufreq_delayed_get_work); | ||
| 250 | } | ||
| 251 | } | ||
| 252 | |||
| 253 | /* | 225 | /* |
| 254 | * if the CPU frequency is scaled, TSC-based delays will need a different | 226 | * if the CPU frequency is scaled, TSC-based delays will need a different |
| 255 | * loops_per_jiffy value to function properly. | 227 | * loops_per_jiffy value to function properly. |
| @@ -313,17 +285,9 @@ static struct notifier_block time_cpufreq_notifier_block = { | |||
| 313 | 285 | ||
| 314 | static int __init cpufreq_tsc(void) | 286 | static int __init cpufreq_tsc(void) |
| 315 | { | 287 | { |
| 316 | int ret; | 288 | return cpufreq_register_notifier(&time_cpufreq_notifier_block, |
| 317 | 289 | CPUFREQ_TRANSITION_NOTIFIER); | |
| 318 | INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get); | ||
| 319 | ret = cpufreq_register_notifier(&time_cpufreq_notifier_block, | ||
| 320 | CPUFREQ_TRANSITION_NOTIFIER); | ||
| 321 | if (!ret) | ||
| 322 | cpufreq_init = 1; | ||
| 323 | |||
| 324 | return ret; | ||
| 325 | } | 290 | } |
| 326 | |||
| 327 | core_initcall(cpufreq_tsc); | 291 | core_initcall(cpufreq_tsc); |
| 328 | 292 | ||
| 329 | #endif | 293 | #endif |
