x86: provide readq()/writeq() on 32-bit too, cleanup
Impact: cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 2594644..3ccfaf6 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -55,21 +55,17 @@
#define __raw_readq __readq
#define __raw_writeq writeq
-/* Let people know we have them */
-#define readq readq
-#define writeq writeq
-
#else /* CONFIG_X86_32 from here */
static inline __u64 readq(const volatile void __iomem *addr)
{
const volatile u32 __iomem *p = addr;
- u32 l, h;
+ u32 low, high;
- l = readl(p);
- h = readl(p + 1);
+ low = readl(p);
+ high = readl(p + 1);
- return l + ((u64)h << 32);
+ return low + ((u64)high << 32);
}
static inline void writeq(__u64 val, volatile void __iomem *addr)
@@ -78,11 +74,12 @@
writel(val >> 32, addr+4);
}
+#endif
+
+/* Let people know that we have them */
#define readq readq
#define writeq writeq
-#endif
-
extern int iommu_bio_merge;
#ifdef CONFIG_X86_32