From: tip-bot for Matthew Whitehead <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, tedheadster@gmail.com,
linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org
Subject: [tip:x86/urgent] x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
Date: Thu, 21 Mar 2019 04:40:47 -0700 [thread overview]
Message-ID: <tip-0f4d3aa761b71cd6984330baca1e18bf0590e441@git.kernel.org> (raw)
In-Reply-To: <1552596361-8967-3-git-send-email-tedheadster@gmail.com>
Commit-ID: 0f4d3aa761b71cd6984330baca1e18bf0590e441
Gitweb: https://git.kernel.org/tip/0f4d3aa761b71cd6984330baca1e18bf0590e441
Author: Matthew Whitehead <tedheadster@gmail.com>
AuthorDate: Thu, 14 Mar 2019 16:46:01 -0400
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 21 Mar 2019 12:28:50 +0100
x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
The getCx86_old() and setCx86_old() macros have been replaced with
correctly working getCx86() and setCx86(), so remove these unused macros.
Signed-off-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: luto@kernel.org
Link: https://lkml.kernel.org/r/1552596361-8967-3-git-send-email-tedheadster@gmail.com
---
arch/x86/include/asm/processor-cyrix.h | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/arch/x86/include/asm/processor-cyrix.h b/arch/x86/include/asm/processor-cyrix.h
index aaedd73ea2c6..df700a6cc869 100644
--- a/arch/x86/include/asm/processor-cyrix.h
+++ b/arch/x86/include/asm/processor-cyrix.h
@@ -3,19 +3,6 @@
* NSC/Cyrix CPU indexed register access. Must be inlined instead of
* macros to ensure correct access ordering
* Access order is always 0x22 (=offset), 0x23 (=value)
- *
- * When using the old macros a line like
- * setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
- * gets expanded to:
- * do {
- * outb((CX86_CCR2), 0x22);
- * outb((({
- * outb((CX86_CCR2), 0x22);
- * inb(0x23);
- * }) | 0x88), 0x23);
- * } while (0);
- *
- * which in fact violates the access order (= 0x22, 0x22, 0x23, 0x23).
*/
static inline u8 getCx86(u8 reg)
@@ -29,11 +16,3 @@ static inline void setCx86(u8 reg, u8 data)
outb(reg, 0x22);
outb(data, 0x23);
}
-
-#define getCx86_old(reg) ({ outb((reg), 0x22); inb(0x23); })
-
-#define setCx86_old(reg, data) do { \
- outb((reg), 0x22); \
- outb((data), 0x23); \
-} while (0)
-
next prev parent reply other threads:[~2019-03-21 11:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 20:45 [PATCH 0/2] x86/CPU: Use correct Cyrix-specific macros Matthew Whitehead
2019-03-14 20:46 ` [PATCH 1/2] x86/CPU: Use correct macros for Cyrix calls on Geode processors Matthew Whitehead
2019-03-21 11:40 ` [tip:x86/urgent] x86/cpu/cyrix: " tip-bot for Matthew Whitehead
2019-03-14 20:46 ` [PATCH 2/2] x86/CPU: Remove {get,set}Cx86_old macros used for Cyrix processors Matthew Whitehead
2019-03-21 11:40 ` tip-bot for Matthew Whitehead [this message]
2019-03-16 19:00 ` [PATCH 0/2] x86/CPU: Use correct Cyrix-specific macros Andy Lutomirski
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=tip-0f4d3aa761b71cd6984330baca1e18bf0590e441@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tedheadster@gmail.com \
--cc=tglx@linutronix.de \
/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
Powered by JetHome