UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: provide readq()/writeq() on 32-bit too, cleanup 

Impact: cleanup

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2008-11-30 09:33:55 +01:00
parent 2c5643b1c5
commit a0b1131e47
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/include/asm/io.h
View File

@ -55,21 +55,17 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
#define __raw_readq __readq #define __raw_readq __readq
#define __raw_writeq writeq #define __raw_writeq writeq
/* Let people know we have them */
#define readq readq
#define writeq writeq
#else /* CONFIG_X86_32 from here */ #else /* CONFIG_X86_32 from here */
static inline __u64 readq(const volatile void __iomem *addr) static inline __u64 readq(const volatile void __iomem *addr)
{ {
const volatile u32 __iomem *p = addr; const volatile u32 __iomem *p = addr;
u32 l, h; u32 low, high;
l = readl(p); low = readl(p);
h = readl(p + 1); high = readl(p + 1);
return l + ((u64)h << 32); return low + ((u64)high << 32);
} }
static inline void writeq(__u64 val, volatile void __iomem *addr) static inline void writeq(__u64 val, volatile void __iomem *addr)
@ -78,11 +74,12 @@ static inline void writeq(__u64 val, volatile void __iomem *addr)
writel(val >> 32, addr+4); writel(val >> 32, addr+4);
} }
#endif
/* Let people know that we have them */
#define readq readq #define readq readq
#define writeq writeq #define writeq writeq
#endif
extern int iommu_bio_merge; extern int iommu_bio_merge;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32