The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 161449bad5053d66f2310744ba8498158ab12c89 Gitweb: https://git.kernel.org/tip/161449bad5053d66f2310744ba8498158ab12c89 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Fri, 24 Jul 2020 13:44:17 +02:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 25 Jul 2020 12:00:57 +02:00 x86/tsc: Remove unused "US_SCALE" and "NS_SCALE" leftover macros Last use of them was removed 13 years ago, when the code was converted to use CYC2NS_SCALE_FACTOR: 53d517cdbaac: ("x86: scale cyc_2_nsec according to CPU frequency") The current TSC code uses the 'struct cyc2ns_data' scaling abstraction, the old fixed scaling approach is long gone. This cleanup also removes the 'arbitralrily' typo from the comment, so win-win. ;-) Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200724114418.629021-3-mingo@xxxxxxxxxx --- arch/x86/include/asm/tsc.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h index 8a0c25c..b7b2624 100644 --- a/arch/x86/include/asm/tsc.h +++ b/arch/x86/include/asm/tsc.h @@ -7,9 +7,6 @@ #include <asm/processor.h> -#define NS_SCALE 10 /* 2^10, carefully chosen */ -#define US_SCALE 32 /* 2^32, arbitralrily chosen */ - /* * Standard way to access the cycle counter. */
![]() |