mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
kprobe/ftrace: fix build error due to bad function definition
commit4b377b4868
upstream. Commit1a7d0890dd
("kprobe/ftrace: bail out if ftrace was killed") introduced a bad K&R function definition, which we haven't accepted in a long long time. Gcc seems to let it slide, but clang notices with the appropriate error: kernel/kprobes.c:1140:24: error: a function declaration without a prototype is deprecated in all > 1140 | void kprobe_ftrace_kill() | ^ | void but this commit was apparently never in linux-next before it was sent upstream, so it didn't get the appropriate build test coverage. Fixes:1a7d0890dd
kprobe/ftrace: bail out if ftrace was killed Cc: Stephen Brennan <stephen.s.brennan@oracle.com> Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org> Cc: Guo Ren <guoren@kernel.org> Cc: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f2dc8dc114
commit
c47b277156
1 changed files with 1 additions and 1 deletions
|
@ -1138,7 +1138,7 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
|
||||||
ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
|
ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
void kprobe_ftrace_kill()
|
void kprobe_ftrace_kill(void)
|
||||||
{
|
{
|
||||||
kprobe_ftrace_disabled = true;
|
kprobe_ftrace_disabled = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue