diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 01:25:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 01:25:08 +0300 |
| commit | 18398bb825eaa12c0d2f490767c2b85e531e0a4c (patch) | |
| tree | 248eff186fe7f6a3fa2ab78f1a6c285c97232e59 /arch/x86/kernel/smpboot.c | |
| parent | 6e5772c8d9cf0a77ba4d6fd34fd4126fb66c9983 (diff) | |
| parent | a757ac555ce1dafca848aa090b66cd04b5ce40e7 (diff) | |
| download | linux-18398bb825eaa12c0d2f490767c2b85e531e0a4c.tar.xz | |
Merge tag 'x86_cleanups_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov:
"The usual round of random minor fixes and cleanups all over the place"
* tag 'x86_cleanups_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/Makefile: Remove unneeded whitespaces before tabs
x86/of: Kill unused early_init_dt_scan_chosen_arch()
x86: Fix misspelled Kconfig symbols
x86/Kconfig: Remove references to obsolete Kconfig symbols
x86/smp: Remove unnecessary assignment to local var freq_scale
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 959599ac25a6..8241927addff 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -2208,7 +2208,7 @@ DEFINE_PER_CPU(unsigned long, arch_freq_scale) = SCHED_CAPACITY_SCALE; void arch_scale_freq_tick(void) { - u64 freq_scale = SCHED_CAPACITY_SCALE; + u64 freq_scale; u64 aperf, mperf; u64 acnt, mcnt; |