Commit 9b2863e2 authored by Palmer Dabbelt's avatar Palmer Dabbelt

Merge patch series "riscv: select ARCH_USE_SYM_ANNOTATIONS"

Jisheng Zhang <jszhang@kernel.org> says:

commit 76329c69 ("riscv: Use SYM_*() assembly macros instead
of deprecated ones"), most riscv has been to converted the new style
SYM_ assembler annotations. The remaining one is sifive's
errata_cip_453.S, so convert to new style SYM_ annotations as well.
After that select ARCH_USE_SYM_ANNOTATIONS.

* b4-shazam-merge:
  riscv: select ARCH_USE_SYM_ANNOTATIONS
  riscv: errata: sifive: Use SYM_*() assembly macros

Link: https://lore.kernel.org/r/20240709160536.3690-1-jszhang@kernel.orgSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents 1e206fad 7c9d980e
...@@ -68,6 +68,7 @@ config RISCV ...@@ -68,6 +68,7 @@ config RISCV
select ARCH_USE_CMPXCHG_LOCKREF if 64BIT select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
select ARCH_USE_MEMTEST select ARCH_USE_MEMTEST
select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_RWLOCKS
select ARCH_USE_SYM_ANNOTATIONS
select ARCH_USES_CFI_TRAPS if CFI_CLANG select ARCH_USES_CFI_TRAPS if CFI_CLANG
select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if MMU
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
1: 1:
.endm .endm
ENTRY(sifive_cip_453_page_fault_trp) SYM_FUNC_START(sifive_cip_453_page_fault_trp)
ADD_SIGN_EXT a0, t0, t1 ADD_SIGN_EXT a0, t0, t1
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
la t0, do_page_fault la t0, do_page_fault
...@@ -29,10 +29,10 @@ ENTRY(sifive_cip_453_page_fault_trp) ...@@ -29,10 +29,10 @@ ENTRY(sifive_cip_453_page_fault_trp)
la t0, do_trap_unknown la t0, do_trap_unknown
#endif #endif
jr t0 jr t0
END(sifive_cip_453_page_fault_trp) SYM_FUNC_END(sifive_cip_453_page_fault_trp)
ENTRY(sifive_cip_453_insn_fault_trp) SYM_FUNC_START(sifive_cip_453_insn_fault_trp)
ADD_SIGN_EXT a0, t0, t1 ADD_SIGN_EXT a0, t0, t1
la t0, do_trap_insn_fault la t0, do_trap_insn_fault
jr t0 jr t0
END(sifive_cip_453_insn_fault_trp) SYM_FUNC_END(sifive_cip_453_insn_fault_trp)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment