Skip to contentSkip to conversation

perf: Fix CONFIG_KPROBE_EVENTS and CONFIG_UPROBE_EVENTS typos

PATCH In review Anton Blanchard 4 participants 4 messages Feb 12, 2017 – Feb 16, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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
index b2e650d..f912fd1 100644
@@ -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
index 436b647..6c74391 100644
@@ -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
#2 lore raw
In reply to Anton Blanchard
Quoted 10 lines · Anton Blanchard

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(-)

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

#3 lore raw

Hi Ingo,

Quoted 6 lines

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.

Ok, patch to follow.

Anton