From patchwork Sun Feb 12 21:14:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 727059 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vM1fV4MTbz9s2s for ; Mon, 13 Feb 2017 08:14:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbdBLVO5 (ORCPT ); Sun, 12 Feb 2017 16:14:57 -0500 Received: from ozlabs.org ([103.22.144.67]:56641 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278AbdBLVO5 (ORCPT ); Sun, 12 Feb 2017 16:14:57 -0500 Received: by ozlabs.org (Postfix, from userid 1010) id 3vM1fR4sZHz9s65; Mon, 13 Feb 2017 08:14:55 +1100 (AEDT) From: Anton Blanchard To: davem@davemloft.net, peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] perf: Fix CONFIG_KPROBE_EVENTS and CONFIG_UPROBE_EVENTS typos Date: Mon, 13 Feb 2017 08:14:49 +1100 Message-Id: <20170212211449.25976-1-anton@ozlabs.org> X-Mailer: git-send-email 2.9.3 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Anton Blanchard Fix some incorrect Kconfig options, they should be CONFIG_KPROBE_EVENT and CONFIG_UPROBE_EVENT. Signed-off-by: Anton Blanchard Acked-by: David S. Miller --- arch/sparc/configs/sparc64_defconfig | 2 +- tools/perf/util/probe-file.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index b2e650d..f912fd1 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -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 diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 436b647..6c74391 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -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",