Skip to content

Commit 25f8b9a

Browse files
torvaldsgregkh
authored andcommitted
kprobe/ftrace: fix build error due to bad function definition
commit 4b377b4 upstream. Commit 1a7d089 ("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: 1a7d089 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>
1 parent a089369 commit 25f8b9a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/kprobes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ static int disarm_kprobe_ftrace(struct kprobe *p)
11381138
ipmodify ? &kprobe_ipmodify_enabled : &kprobe_ftrace_enabled);
11391139
}
11401140

1141-
void kprobe_ftrace_kill()
1141+
void kprobe_ftrace_kill(void)
11421142
{
11431143
kprobe_ftrace_disabled = true;
11441144
}

0 commit comments

Comments
 (0)