From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cleanups] x86/tsc: Remove unused "US_SCALE" and "NS_SCALE" leftover macros
Date: Sat, 25 Jul 2020 10:13:40 -0000 [thread overview]
Message-ID: <159567202032.4006.6639431900725796846.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200724114418.629021-3-mingo@kernel.org>
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@kernel.org>
AuthorDate: Fri, 24 Jul 2020 13:44:17 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
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@kernel.org>
Link: https://lore.kernel.org/r/20200724114418.629021-3-mingo@kernel.org
---
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.
*/
next prev parent reply other threads:[~2020-07-25 10:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 11:44 [PATCH 0/3] x86 cleanups of leftover code Ingo Molnar
2020-07-24 11:44 ` [PATCH 1/3] x86/ioapic: Remove unused "IOAPIC_AUTO" define Ingo Molnar
2020-07-25 10:13 ` [tip: x86/cleanups] " tip-bot2 for Ingo Molnar
2020-07-24 11:44 ` [PATCH 2/3] x86/tsc: Remove unused "US_SCALE" and "NS_SCALE" leftover macros Ingo Molnar
2020-07-25 10:13 ` tip-bot2 for Ingo Molnar [this message]
2020-07-24 11:44 ` [PATCH 3/3] x86/mm: Remove the unused mk_kernel_pgd() #define Ingo Molnar
2020-07-25 10:13 ` [tip: x86/cleanups] " tip-bot2 for Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159567202032.4006.6639431900725796846.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®