diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2021-08-26 11:49:33 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2021-08-26 11:49:33 +0100 |
commit | 1a7f67e618d42e9870dcd9fb0c7b2682d71fd631 (patch) | |
tree | c6f4ce5fd12a8f75b2642a5b58031f4286005800 /arch/arm64/kernel/signal.c | |
parent | Merge branches 'for-next/mte', 'for-next/misc' and 'for-next/kselftest', remote-tracking branch 'arm64/for-next/perf' into for-next/core (diff) | |
parent | arm64: entry: call exit_to_user_mode() from C (diff) | |
download | linux-dev-1a7f67e618d42e9870dcd9fb0c7b2682d71fd631.tar.xz linux-dev-1a7f67e618d42e9870dcd9fb0c7b2682d71fd631.zip |
Merge branch 'for-next/entry' into for-next/core
* for-next/entry:
: More entry.S clean-ups and conversion to C.
arm64: entry: call exit_to_user_mode() from C
arm64: entry: move bulk of ret_to_user to C
arm64: entry: clarify entry/exit helpers
arm64: entry: consolidate entry/exit helpers
Diffstat (limited to 'arch/arm64/kernel/signal.c')
-rw-r--r-- | arch/arm64/kernel/signal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 3b4c927d31ff..e93ffd7d38e1 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -929,8 +929,7 @@ static bool cpu_affinity_invalid(struct pt_regs *regs) system_32bit_el0_cpumask()); } -asmlinkage void do_notify_resume(struct pt_regs *regs, - unsigned long thread_flags) +void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags) { do { if (thread_flags & _TIF_NEED_RESCHED) { |