From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
"Lendacky, Thomas" <Thomas.Lendacky@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Borislav Petkov <bp@alien8.de>, Jiri Olsa <jolsa@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 2/7] x86/perf/amd: Fix build failure when CONFIG_HAVE_NMI_WATCHDOG is not set
Date: Fri, 12 Apr 2019 11:22:45 -0300 [thread overview]
Message-ID: <20190412142250.20595-3-acme@kernel.org> (raw)
In-Reply-To: <20190412142250.20595-1-acme@kernel.org>
From: "Lendacky, Thomas" <Thomas.Lendacky@amd.com>
When CONFIG_HAVE_NMI_WATCHDOG is not set, the asm/nmi.h file is not
included. The asm/nmi.h file contains the definitions for NMI_HANDLED
and NMI_DONE which are used in arch/x86/events/amd/core.c. This causes
the build the fail.
Fix the issue by changing the include in arch/x86/events/amd/core.c from
linux/nmi.h to asm/nmi.h.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
arch/x86/events/amd/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index 5d423653f744..0ecfac84ba91 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -4,8 +4,8 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
-#include <linux/nmi.h>
#include <asm/apicdef.h>
+#include <asm/nmi.h>
#include "../perf_event.h"
--
2.20.1
next prev parent reply other threads:[~2019-04-12 14:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 14:22 [GIT PULL 0/7] perf/urgent fixes Arnaldo Carvalho de Melo
2019-04-12 14:22 ` [PATCH 1/7] x86/perf/amd: Remove need to check "running" bit in NMI handler Arnaldo Carvalho de Melo
2019-04-12 14:22 ` Arnaldo Carvalho de Melo [this message]
2019-04-12 14:22 ` [PATCH 3/7] perf header: Fix lock/unlock imbalances when processing BPF/BTF info Arnaldo Carvalho de Melo
2019-04-12 16:14 ` Song Liu
2019-04-12 14:22 ` [PATCH 4/7] perf scripts python: export-to-sqlite.py: Fix use of parent_id in calls_view Arnaldo Carvalho de Melo
2019-04-12 14:22 ` [PATCH 5/7] perf stat: Disable DIR_FORMAT feature for 'perf stat record' Arnaldo Carvalho de Melo
2019-04-12 14:22 ` [PATCH 6/7] tools lib traceevent: Fix missing equality check for strcmp Arnaldo Carvalho de Melo
2019-04-12 14:22 ` [PATCH 7/7] perf evsel: Use hweight64() instead of hweight_long(attr.sample_regs_user) Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190412142250.20595-3-acme@kernel.org \
--to=acme@kernel.org \
--cc=Thomas.Lendacky@amd.com \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).