Skip to content

Commit 1709c70

Browse files
Merge branch 'riscv-variable_fixes_without_kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git into fixes
This contains a pair of fixes for build-time warnings. * 'riscv-variable_fixes_without_kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git: riscv: traps: add missing prototype riscv: signal: fix missing prototype warning
2 parents 92e55a8 + d951b20 commit 1709c70

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

arch/riscv/include/asm/signal.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
3+
#ifndef __ASM_SIGNAL_H
4+
#define __ASM_SIGNAL_H
5+
6+
#include <uapi/asm/signal.h>
7+
#include <uapi/asm/ptrace.h>
8+
9+
asmlinkage __visible
10+
void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);
11+
12+
#endif

arch/riscv/include/asm/thread_info.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242

4343
#ifndef __ASSEMBLY__
4444

45+
extern long shadow_stack[SHADOW_OVERFLOW_STACK_SIZE / sizeof(long)];
46+
4547
#include <asm/processor.h>
4648
#include <asm/csr.h>
4749

arch/riscv/kernel/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <asm/ucontext.h>
1717
#include <asm/vdso.h>
18+
#include <asm/signal.h>
1819
#include <asm/signal32.h>
1920
#include <asm/switch_to.h>
2021
#include <asm/csr.h>

arch/riscv/kernel/traps.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

2121
#include <asm/asm-prototypes.h>
2222
#include <asm/bug.h>
23+
#include <asm/csr.h>
2324
#include <asm/processor.h>
2425
#include <asm/ptrace.h>
25-
#include <asm/csr.h>
26+
#include <asm/thread_info.h>
2627

2728
int show_unhandled_signals = 1;
2829

0 commit comments

Comments
 (0)