diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 12:00:02 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 12:00:02 +0900 |
| commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
| tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /include/asm-generic/io-64-nonatomic-hi-lo.h | |
| parent | d537543b3948bc3bc9dede248fa455493e055457 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
| download | op-kernel-dev-998f468f34f41905051556a9897dbc204b1b75b4.zip op-kernel-dev-998f468f34f41905051556a9897dbc204b1b75b4.tar.gz | |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'include/asm-generic/io-64-nonatomic-hi-lo.h')
| -rw-r--r-- | include/asm-generic/io-64-nonatomic-hi-lo.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h index 2e29d13..32b73ab 100644 --- a/include/asm-generic/io-64-nonatomic-hi-lo.h +++ b/include/asm-generic/io-64-nonatomic-hi-lo.h @@ -1,32 +1,2 @@ -#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_ -#define _ASM_IO_64_NONATOMIC_HI_LO_H_ - -#include <linux/io.h> -#include <asm-generic/int-ll64.h> - -static inline __u64 hi_lo_readq(const volatile void __iomem *addr) -{ - const volatile u32 __iomem *p = addr; - u32 low, high; - - high = readl(p + 1); - low = readl(p); - - return low + ((u64)high << 32); -} - -static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr) -{ - writel(val >> 32, addr + 4); - writel(val, addr); -} - -#ifndef readq -#define readq hi_lo_readq -#endif - -#ifndef writeq -#define writeq hi_lo_writeq -#endif - -#endif /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */ +/* XXX: delete asm-generic/io-64-nonatomic-hi-lo.h after converting new users */ +#include <linux/io-64-nonatomic-hi-lo.h> |
