2019-04-03 15:25:57

by Tom Lendacky

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
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.17.1