perf: Fix CONFIG_KPROBE_EVENTS and CONFIG_UPROBE_EVENTS typos
Subsystems (2)
PATCH 1/1 perf: Fix CONFIG_KPROBE_EVENTS and CONFIG_UPROBE_EVENTS typos
From: Anton Blanchard <[email protected]>
Fix some incorrect Kconfig options, they should be CONFIG_KPROBE_EVENT and CONFIG_UPROBE_EVENT.
--- arch/sparc/configs/sparc64_defconfig | 2 +- tools/perf/util/probe-file.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/sparc/configs/sparc64_defconfig +1 -1
@@ -213,7 +213,7 @@ CONFIG_SCHEDSTATS=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_UPROBE_EVENTS=y +CONFIG_UPROBE_EVENT=y CONFIG_KEYS=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_TEST=m
tools/perf/util/probe-file.c +4 -4
@@ -38,9 +38,9 @@ static void print_open_warning(int err, bool uprobe)const char *config;if (uprobe) - config ="CONFIG_UPROBE_EVENTS" ; + config ="CONFIG_UPROBE_EVENT" ;else - config ="CONFIG_KPROBE_EVENTS" ; + config ="CONFIG_KPROBE_EVENT" ; pr_warning("%cprobe_events file does not exist" " - please rebuild kernel with %s.\n",
@@ -59,8 +59,8 @@ static void print_both_open_warning(int kerr, int uerr)if (kerr = -ENOTSUP && uerr = -ENOTSUP )pr_warning ("Tracefs or debugfs is not mounted.\n" );else if (kerr = -ENOENT && uerr = -ENOENT ) -pr_warning ("Please rebuild kernel with CONFIG_KPROBE_EVENTS " -"or/and CONFIG_UPROBE_EVENTS.\n" ); +pr_warning ("Please rebuild kernel with CONFIG_KPROBE_EVENT " +"or/and CONFIG_UPROBE_EVENT.\n" );else {char sbuf[STRERR_BUFSIZE ]; pr_warning("Failed to open kprobe events: %s.\n",
Signature · 1 line
2.9.3
From: Anton Blanchard <[email protected]>
Date: Mon, 13 Feb 2017 08:14:49 +1100
Quoted 6 lines
From: Anton Blanchard <[email protected]>
Fix some incorrect
Kconfigoptions, they should beCONFIG_KPROBE_EVENTandCONFIG_UPROBE_EVENT.Signed-off-by Anton Blanchard <[email protected]>
Quoted 10 lines · Anton Blanchard
From: Anton Blanchard <[email protected]>
Fix some incorrect
Kconfigoptions, they should beCONFIG_KPROBE_EVENTandCONFIG_UPROBE_EVENT.Signed-off-by Anton Blanchard <[email protected]>--- arch/sparc/configs/sparc64_defconfig | 2 +- tools/perf/util/probe-file.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
So the names should be fixed, it should be CONFIG_UPROBE_EVENTS and CONFIG_KPROBE_EVENTS throughout the code. It's CONFIG_PERF_EVENTS and CONFIG_PROBE_EVENTS after all and lives in kernel/events/ - all plural.
I didn't notice the misnomer when merging these bits.
Thanks,
Ingo
Hi Ingo,
Quoted 6 lines
So the names should be fixed, it should be
CONFIG_UPROBE_EVENTSandCONFIG_KPROBE_EVENTSthroughout the code. It'sCONFIG_PERF_EVENTSandCONFIG_PROBE_EVENTSafter all and lives inkernel/events/- all plural.I didn't notice the misnomer when merging these bits.
Ok, patch to follow.
Anton