Skip to content

Commit

Permalink
RISC-V: Remove unused code from STRICT_KERNEL_RWX
Browse files Browse the repository at this point in the history
This patch removes the unused functions set_kernel_text_rw/ro.
Currently, it is not being invoked from anywhere and no other architecture
(except arm) uses this code. Even in ARM, these functions are not invoked
from anywhere currently.

Fixes: d27c3c9 ("riscv: add STRICT_KERNEL_RWX support")
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Zong Li <zong.li@sifive.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
  • Loading branch information
Atish Patra authored and Palmer Dabbelt committed May 6, 2020
1 parent d6d5161 commit 73cb8e2
Showing 2 changed files with 0 additions and 24 deletions.
8 changes: 0 additions & 8 deletions arch/riscv/include/asm/set_memory.h
Original file line number Diff line number Diff line change
@@ -22,14 +22,6 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; }
static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
#endif

#ifdef CONFIG_STRICT_KERNEL_RWX
void set_kernel_text_ro(void);
void set_kernel_text_rw(void);
#else
static inline void set_kernel_text_ro(void) { }
static inline void set_kernel_text_rw(void) { }
#endif

int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);

16 changes: 0 additions & 16 deletions arch/riscv/mm/init.c
Original file line number Diff line number Diff line change
@@ -502,22 +502,6 @@ static inline void setup_vm_final(void)
#endif /* CONFIG_MMU */

#ifdef CONFIG_STRICT_KERNEL_RWX
void set_kernel_text_rw(void)
{
unsigned long text_start = (unsigned long)_text;
unsigned long text_end = (unsigned long)_etext;

set_memory_rw(text_start, (text_end - text_start) >> PAGE_SHIFT);
}

void set_kernel_text_ro(void)
{
unsigned long text_start = (unsigned long)_text;
unsigned long text_end = (unsigned long)_etext;

set_memory_ro(text_start, (text_end - text_start) >> PAGE_SHIFT);
}

void mark_rodata_ro(void)
{
unsigned long text_start = (unsigned long)_text;

0 comments on commit 73cb8e2

Please sign in to comment.