diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-01-09 15:00:32 +0100 |
|---|---|---|
| committer |   Palmer Dabbelt <palmer@dabbelt.com> | 2018-01-30 19:16:12 -0800 |
| commit | 7549cdf59d9fafbaab42650375c29c64c16aa270 (patch) | |
| tree | 1fca5e4c7891c3af0ca8991b97ce77ceb55358b7 /arch/riscv/kernel | |
| parent | riscv: don't read back satp in paging_init (diff) | |
| download | linux-dev-7549cdf59d9fafbaab42650375c29c64c16aa270.tar.xz linux-dev-7549cdf59d9fafbaab42650375c29c64c16aa270.zip | |
riscv: rename sptbr to satp
satp is the name used by the current privileged spec 1.10, use it
instead of the old name. The most recent release binutils release
(2.29) doesn't know about the satp name yet, so stick to the name from
the previous privileged ISA release and comment on the fact.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'arch/riscv/kernel')
| -rw-r--r-- | arch/riscv/kernel/head.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 78f670d70133..226eeb190f90 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -74,15 +74,15 @@ relocate: sub a1, a1, a0 add ra, ra, a1 - /* Point stvec to virtual address of intruction after sptbr write */ + /* Point stvec to virtual address of intruction after satp write */ la a0, 1f add a0, a0, a1 csrw stvec, a0 - /* Compute sptbr for kernel page tables, but don't load it yet */ + /* Compute satp for kernel page tables, but don't load it yet */ la a2, swapper_pg_dir srl a2, a2, PAGE_SHIFT - li a1, SPTBR_MODE + li a1, SATP_MODE or a2, a2, a1 /* |