diff options
| author | Guo Ren | 2019-04-19 11:10:52 +0200 |
|---|---|---|
| committer | Guo Ren | 2019-04-22 07:44:57 +0200 |
| commit | 683fafebf93bcde9948246849348b888e185cb22 (patch) | |
| tree | dc612f1998fe65de5c7357f6d4d3d0c202b5fd89 /arch/csky/mm | |
| parent | csky: Support vmlinux bootup with MMU off (diff) | |
| download | kernel-qcow2-linux-683fafebf93bcde9948246849348b888e185cb22.tar.gz kernel-qcow2-linux-683fafebf93bcde9948246849348b888e185cb22.tar.xz kernel-qcow2-linux-683fafebf93bcde9948246849348b888e185cb22.zip | |
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/mm')
| -rw-r--r-- | arch/csky/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c index e1725f8a06f9..5beb25ca1c79 100644 --- a/arch/csky/mm/fault.c +++ b/arch/csky/mm/fault.c @@ -81,7 +81,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, unsigned long pgd_base; - pgd_base = tlb_get_pgd(); + pgd_base = __va(get_pgd()); pgd = (pgd_t *)pgd_base + offset; pgd_k = init_mm.pgd + offset; |