diff options
| -rw-r--r-- | arch/x86/kernel/tsc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 3e1c057e98fe..3fbd3206eccf 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -631,17 +631,15 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, | |||
| 631 | void *data) | 631 | void *data) |
| 632 | { | 632 | { |
| 633 | struct cpufreq_freqs *freq = data; | 633 | struct cpufreq_freqs *freq = data; |
| 634 | unsigned long *lpj, dummy; | 634 | unsigned long *lpj; |
| 635 | 635 | ||
| 636 | if (cpu_has(&cpu_data(freq->cpu), X86_FEATURE_CONSTANT_TSC)) | 636 | if (cpu_has(&cpu_data(freq->cpu), X86_FEATURE_CONSTANT_TSC)) |
| 637 | return 0; | 637 | return 0; |
| 638 | 638 | ||
| 639 | lpj = &dummy; | 639 | lpj = &boot_cpu_data.loops_per_jiffy; |
| 640 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) | ||
| 641 | #ifdef CONFIG_SMP | 640 | #ifdef CONFIG_SMP |
| 641 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) | ||
| 642 | lpj = &cpu_data(freq->cpu).loops_per_jiffy; | 642 | lpj = &cpu_data(freq->cpu).loops_per_jiffy; |
| 643 | #else | ||
| 644 | lpj = &boot_cpu_data.loops_per_jiffy; | ||
| 645 | #endif | 643 | #endif |
| 646 | 644 | ||
| 647 | if (!ref_freq) { | 645 | if (!ref_freq) { |
