Commit-ID: 1eb4164ed5433d0bb68726c1d8b498b3195c8b10 Gitweb: https://git.kernel.org/tip/1eb4164ed5433d0bb68726c1d8b498b3195c8b10 Author: Lendacky, Thomas <Thomas.Lendacky@xxxxxxx> AuthorDate: Wed, 3 Apr 2019 15:24:43 +0000 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Fri, 5 Apr 2019 08:45:11 +0200 x86/perf/amd: Fix build failure when CONFIG_HAVE_NMI_WATCHDOG is not set 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@xxxxxxx> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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"
|