Skip to content

Commit 8ed2e95

Browse files
torvaldsroxanan1996
authored andcommitted
kprobe/ftrace: fix build error due to bad function definition
BugLink: https://bugs.launchpad.net/bugs/2075154 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 <[email protected]> Cc: Masami Hiramatsu (Google) <[email protected]> Cc: Guo Ren <[email protected]> Cc: Steven Rostedt (Google) <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 8f00185 commit 8ed2e95

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)