Commit a99efa00 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'riscv/for-v5.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

Pull RISC-V fixes from Paul Walmsley:
 "One important fix for RISC-V:

   - Redirect any incoming syscall with an ID less than -1 to
     sys_ni_syscall, rather than allowing them to fall through into the
     syscall handler.

  and two minor build fixes:

   - Export __asm_copy_{from,to}_user() from where they are defined.
     This fixes a build error triggered by some randconfigs.

   - Export flush_icache_all(). I'd resisted this before, since
     historically we didn't want modules to be able to flush the I$
     directly; but apparently everyone else is doing it now"

* tag 'riscv/for-v5.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: export flush_icache_all to modules
  riscv: reject invalid syscalls below -1
  riscv: fix compile failure with EXPORT_SYMBOL() & !MMU
parents d7566386 1833e327
...@@ -246,6 +246,7 @@ check_syscall_nr: ...@@ -246,6 +246,7 @@ check_syscall_nr:
*/ */
li t1, -1 li t1, -1
beq a7, t1, ret_from_syscall_rejected beq a7, t1, ret_from_syscall_rejected
blt a7, t1, 1f
/* Call syscall */ /* Call syscall */
la s0, sys_call_table la s0, sys_call_table
slli t0, a7, RISCV_LGPTR slli t0, a7, RISCV_LGPTR
......
...@@ -9,8 +9,5 @@ ...@@ -9,8 +9,5 @@
/* /*
* Assembly functions that may be used (directly or indirectly) by modules * Assembly functions that may be used (directly or indirectly) by modules
*/ */
EXPORT_SYMBOL(__clear_user);
EXPORT_SYMBOL(__asm_copy_to_user);
EXPORT_SYMBOL(__asm_copy_from_user);
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memcpy);
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm-generic/export.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/csr.h> #include <asm/csr.h>
...@@ -66,6 +67,8 @@ ENTRY(__asm_copy_from_user) ...@@ -66,6 +67,8 @@ ENTRY(__asm_copy_from_user)
j 3b j 3b
ENDPROC(__asm_copy_to_user) ENDPROC(__asm_copy_to_user)
ENDPROC(__asm_copy_from_user) ENDPROC(__asm_copy_from_user)
EXPORT_SYMBOL(__asm_copy_to_user)
EXPORT_SYMBOL(__asm_copy_from_user)
ENTRY(__clear_user) ENTRY(__clear_user)
...@@ -108,6 +111,7 @@ ENTRY(__clear_user) ...@@ -108,6 +111,7 @@ ENTRY(__clear_user)
bltu a0, a3, 5b bltu a0, a3, 5b
j 3b j 3b
ENDPROC(__clear_user) ENDPROC(__clear_user)
EXPORT_SYMBOL(__clear_user)
.section .fixup,"ax" .section .fixup,"ax"
.balign 4 .balign 4
......
...@@ -22,6 +22,7 @@ void flush_icache_all(void) ...@@ -22,6 +22,7 @@ void flush_icache_all(void)
else else
on_each_cpu(ipi_remote_fence_i, NULL, 1); on_each_cpu(ipi_remote_fence_i, NULL, 1);
} }
EXPORT_SYMBOL(flush_icache_all);
/* /*
* Performs an icache flush for the given MM context. RISC-V has no direct * Performs an icache flush for the given MM context. RISC-V has no direct
......
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