fix machine vectors for mmiowb
PATCH 1/1 fix machine vectors for mmiowb
I left out some of the necessary machine vector magic in the mmiowb patch which caused the generic build to break. This patch fixes it up by properly #defining it and #undefing it and adding a routine to lib/io.c.
Signed-off-by Jesse Barnes <[email protected]>
Thanks,
Jesse
===== arch/ia64/lib/io.c 1.9 vs edited =====
arch/ia64/lib/io.c +7 -0
@@ -73,6 +73,7 @@#undef __ia64_writew#undef __ia64_writel#undef __ia64_writeq +#undef __ia64_mmiowbunsigned int __ia64_inb (unsigned long port)
@@ -156,6 +157,12 @@ __ia64_readq_relaxed (void __iomem *addr) {return ___ia64_readq (addr); +} + +void +__ia64_mmiowb (void ) +{ +___ia64_mmiowb (); }#endif /* CONFIG_IA64_GENERIC */
===== include/asm-ia64/io.h 1.22 vs edited =====
include/asm-ia64/io.h +3 -2
@@ -92,7 +92,7 @@#define __ia64_mf_a () ia64_mfa()/** -* __ia64_mmiowb - I/O write barrier +* ___ia64_mmiowb - I/O write barrier * * Ensure ordering of I/O space writes. This will make sure that writes * following the barrier will arrive after all previous writes. For most
@@ -100,7 +100,7 @@* * See Documentation/DocBook/deviceiobook.tmpl for more information. */ -static inline void __ia64_mmiowb (void ) +static inline void ___ia64_mmiowb (void ) {ia64_mfa (); }
@@ -147,6 +147,7 @@#define __ia64_writew ___ia64_writew#define __ia64_writel ___ia64_writel#define __ia64_writeq ___ia64_writeq +#define __ia64_mmiowb ___ia64_mmiowb/* * For the in/out routines, we need to do "mf.a" _after_ doing the I/O access to ensure