From: Nick Piggin Should probably be reworked not to require this, but get it building. Cc: TAKADA Yoshihito Cc: Jordan Crouse Cc: Andres Salomon Cc: Andi Kleen Cc: Alan Cox Signed-off-by: Andrew Morton --- include/asm-x86_64/processor-cyrix.h | 30 +++++++++++++++++++++++++ 1 files changed, 30 insertions(+) diff -puN /dev/null include/asm-x86_64/processor-cyrix.h --- /dev/null +++ a/include/asm-x86_64/processor-cyrix.h @@ -0,0 +1,30 @@ +/* + * 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) +{ + outb(reg, 0x22); + return inb(0x23); +} + +static inline void setCx86(u8 reg, u8 data) +{ + outb(reg, 0x22); + outb(data, 0x23); +} _