x86/tsc: Make recalibrate_cpu_khz() export GPL only
Borislav Petkov
maintainerPATCH 1/1 x86/tsc: Make recalibrate_cpu_khz() export GPL only
From: "Borislav Petkov (AMD)" <[email protected]>
A quick search doesn't reveal any use outside of the kernel - which would be questionable to begin with anyway - so make the export GPL only.
--- arch/x86/kernel/tsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/tsc.c +1 -1
@@ -913,7 +913,7 @@ void recalibrate_cpu_khz(void)#endif } -EXPORT_SYMBOL (recalibrate_cpu_khz); +EXPORT_SYMBOL_GPL (recalibrate_cpu_khz);static unsigned long long cyc2ns_suspend;
Signature · 1 line
2.35.1
Borislav Petkov
maintainerPATCH 1/2 x86/tsc: Make recalibrate_cpu_khz() export GPL only
v1.1 which removes a stray newline too.
---
From: "Borislav Petkov (AMD)" <[email protected]>
A quick search doesn't reveal any use outside of the kernel - which would be questionable to begin with anyway - so make the export GPL only.
--- arch/x86/kernel/tsc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/tsc.c +1 -2
@@ -912,8 +912,7 @@ void recalibrate_cpu_khz(void) cpu_khz_old, cpu_khz);#endif } - -EXPORT_SYMBOL (recalibrate_cpu_khz); +EXPORT_SYMBOL_GPL (recalibrate_cpu_khz);static unsigned long long cyc2ns_suspend;
Signature · 8 lines
2.35.1
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteThe following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 8fe6d84947582e2c076abc6253b80709fb047935 Gitweb: https://git.kernel.org/tip/8fe6d84947582e2c076abc6253b80709fb047935 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Sun, 18 Dec 2022 21:52:42 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Sat, 11 Feb 2023 10:44:07 +01:00
x86/tsc: Make recalibrate_cpu_khz() export GPL only
A quick search doesn't reveal any use outside of the kernel - which would be questionable to begin with anyway - so make the export GPL only.
--- arch/x86/kernel/tsc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/tsc.c +1 -2
@@ -912,8 +912,7 @@ void recalibrate_cpu_khz(void) cpu_khz_old, cpu_khz);#endif } - -EXPORT_SYMBOL (recalibrate_cpu_khz); +EXPORT_SYMBOL_GPL (recalibrate_cpu_khz);static unsigned long long cyc2ns_suspend;
Borislav Petkov
maintainerPATCH 2/2 x86/tsc: Do feature check as the very first thing
In reply to Borislav PetkovFrom: "Borislav Petkov (AMD)" <[email protected]>
Do the feature check as the very first thing in the function. Everything else comes after that and is meaningless work if the TSC CPUID bit is not even set.
No functional changes.
--- arch/x86/kernel/tsc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/tsc.c +5 -5
@@ -1509,6 +1509,11 @@ void __init tsc_early_init(void)void __init tsc_init (void ) { +if (!boot_cpu_has (X86_FEATURE_TSC )) { +setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER ); +return ; + } +/* * native_calibrate_cpu_early can only calibrate using methods that are * available early in boot.
@@ -1516,11 +1521,6 @@ void __init tsc_init(void)if (x86_platform.calibrate_cpu == native_calibrate_cpu_early) x86_platform.calibrate_cpu = native_calibrate_cpu; -if (!boot_cpu_has (X86_FEATURE_TSC )) { -setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER ); -return ; - } -if (!tsc_khz) {/* We failed to determine frequencies earlier, try again */ if (!determine_cpu_tsc_frequencies (false)) {
Signature · 8 lines
2.35.1
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette[tip: x86/cleanups] x86/tsc: Do feature check as the very first thing
The following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 6b8d5dde5b6903baf82fc7400e0b3376b10805b4 Gitweb: https://git.kernel.org/tip/6b8d5dde5b6903baf82fc7400e0b3376b10805b4 Author: Borislav Petkov (AMD) <[email protected]> AuthorDate: Sun, 18 Dec 2022 21:53:36 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Sat, 11 Feb 2023 10:44:07 +01:00
x86/tsc: Do feature check as the very first thing
Do the feature check as the very first thing in the function. Everything else comes after that and is meaningless work if the TSC CPUID bit is not even set. Switch to cpu_feature_enabled() too, while at it.
No functional changes.
--- arch/x86/kernel/tsc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/tsc.c +5 -5
@@ -1509,6 +1509,11 @@ void __init tsc_early_init(void)void __init tsc_init (void ) { +if (!cpu_feature_enabled (X86_FEATURE_TSC )) { +setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER ); +return ; + } +/* * native_calibrate_cpu_early can only calibrate using methods that are * available early in boot.
@@ -1516,11 +1521,6 @@ void __init tsc_init(void)if (x86_platform.calibrate_cpu == native_calibrate_cpu_early) x86_platform.calibrate_cpu = native_calibrate_cpu; -if (!boot_cpu_has (X86_FEATURE_TSC )) { -setup_clear_cpu_cap (X86_FEATURE_TSC_DEADLINE_TIMER ); -return ; - } -if (!tsc_khz) {/* We failed to determine frequencies earlier, try again */ if (!determine_cpu_tsc_frequencies (false)) {