summaryrefslogtreecommitdiff
path: root/arch/csky/abiv1/inc
diff options
context:
space:
mode:
authorGuo Ren <ren_guo@c-sky.com>2019-04-19 17:10:52 +0800
committerGuo Ren <ren_guo@c-sky.com>2019-04-22 13:44:57 +0800
commit683fafebf93bcde9948246849348b888e185cb22 (patch)
treedc612f1998fe65de5c7357f6d4d3d0c202b5fd89 /arch/csky/abiv1/inc
parent205353fa06cc5dbfe1949de013ba905bb151c702 (diff)
downloadlinux-sh-683fafebf93bcde9948246849348b888e185cb22.tar.gz
csky: Use va_pa_offset instead of phys_offset
The name of phys_offset is so common for global export and it may conflict with some local name. So change phys_offset to va_pa_offset which also used by riscv. Also use __pa() and __va() instead of using phys_offset directly. Signed-off-by: Guo Ren <ren_guo@c-sky.com> Cc: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/csky/abiv1/inc')
-rw-r--r--arch/csky/abiv1/inc/abi/ckmmu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/csky/abiv1/inc/abi/ckmmu.h b/arch/csky/abiv1/inc/abi/ckmmu.h
index 85339bd224c4..81f37715c0d2 100644
--- a/arch/csky/abiv1/inc/abi/ckmmu.h
+++ b/arch/csky/abiv1/inc/abi/ckmmu.h
@@ -85,11 +85,11 @@ static inline void tlb_invalid_indexed(void)
static inline void setup_pgd(unsigned long pgd, bool kernel)
{
- cpwcr("cpcr29", pgd);
+ cpwcr("cpcr29", pgd | BIT(0));
}
static inline unsigned long get_pgd(void)
{
- return cprcr("cpcr29");
+ return cprcr("cpcr29") & ~BIT(0);
}
#endif /* __ASM_CSKY_CKMMUV1_H */