[PATCH 1/2] x86/mm/tlb: include tracepoints from tlb.c instead of mmu_context.h

From: Radim KrÄmÃÅ
Date: Tue Sep 03 2019 - 11:43:59 EST


asm/mmu_context.h is a tree-wide include that will unnecessarily break
the build if CREATE_TRACE_POINTS is defined when including it.

Signed-off-by: Radim KrÄmÃÅ <rkrcmar@xxxxxxxxxx>
---
arch/x86/include/asm/mmu_context.h | 2 --
arch/x86/mm/tlb.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 16ae821483c8..e59f230ff981 100644
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -7,8 +7,6 @@
#include <linux/mm_types.h>
#include <linux/pkeys.h>

-#include <trace/events/tlb.h>
-
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/paravirt.h>
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index e6a9edc5baaf..83cd66a0db99 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -18,6 +18,8 @@

#include "mm_internal.h"

+#include <trace/events/tlb.h>
+
/*
* TLB flushing, formerly SMP-only
* c/o Linus Torvalds.
--
2.23.0