[tip: core/headers] perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys()

From: tip-bot2 for Sean Christopherson
Date: Tue Nov 26 2019 - 03:00:54 EST


The following commit has been merged into the core/headers branch of tip:

Commit-ID: 7bd4cb7e93c288dbec40cd3065e4fceb21343b11
Gitweb: https://git.kernel.org/tip/7bd4cb7e93c288dbec40cd3065e4fceb21343b11
Author: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
AuthorDate: Mon, 18 Nov 2019 16:21:14 -08:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Tue, 19 Nov 2019 17:50:26 +01:00

perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys()

Through a labyrinthian sequence of includes, usage of virt_to_phys() is
dependent on the include of asm/io.h in asm/realmode.h via asm/acpi.h.
Explicitly include asm/io.h to break the dependency on realmode.h so
that a future patch can remove the realmode.h include from acpi.h
without breaking the build.

Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20191119002121.4107-6-sean.j.christopherson@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/events/intel/ds.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index ce83950..4b94ae4 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -7,6 +7,7 @@
#include <asm/perf_event.h>
#include <asm/tlbflush.h>
#include <asm/insn.h>
+#include <asm/io.h>

#include "../perf_event.h"