diff mbox series

[V2,03/30] x86/pkru: Remove useless include

Message ID	20211015011538.551522694@linutronix.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> Message-ID: <20211015011538.551522694@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, "Chang S. Bae" <chang.seok.bae@intel.com>, Dave Hansen <dave.hansen@linux.intel.com>, Arjan van de Ven <arjan@linux.intel.com>, kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>, "Liu, Jing2" <jing2.liu@intel.com>, Sean Christopherson <seanjc@google.com>, Xiaoyao Li <xiaoyao.li@intel.com> Subject: [patch V2 03/30] x86/pkru: Remove useless include References: <20211015011411.304289784@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Fri, 15 Oct 2021 03:15:57 +0200 (CEST) Precedence: bulk
Series	x86/fpu: Preparatory cleanups for AMX support (part 1) \| expand [V2,00/30] x86/fpu: Preparatory cleanups for AMX support (part 1) [V2,01/30] x86/fpu: Remove pointless argument from switch_fpu_finish() [V2,02/30] x86/fpu: Update stale comments [V2,03/30] x86/pkru: Remove useless include [V2,04/30] x86/fpu: Restrict xsaves()/xrstors() to independent states [V2,05/30] x86/fpu: Cleanup the on_boot_cpu clutter [V2,06/30] x86/fpu: Remove pointless memset in fpu_clone() [V2,07/30] x86/process: Clone FPU in copy_thread() [V2,08/30] x86/fpu: Do not inherit FPU context for kernel and IO worker threads [V2,09/30] x86/fpu: Cleanup xstate xcomp_bv initialization [V2,10/30] x86/fpu/xstate: Provide and use for_each_xfeature() [V2,11/30] x86/fpu/xstate: Mark all init only functions __init [V2,12/30] x86/fpu: Move KVMs FPU swapping to FPU core [V2,13/30] x86/fpu: Replace KVMs home brewed FPU copy from user [V2,14/30] x86/fpu: Rework copy_xstate_to_uabi_buf() [V2,15/30] x86/fpu: Replace KVMs home brewed FPU copy to user [V2,16/30] x86/fpu: Mark fpu__init_prepare_fx_sw_frame() as __init [V2,17/30] x86/fpu: Move context switch and exit to user inlines into sched.h [V2,18/30] x86/fpu: Clean up cpu feature tests [V2,19/30] x86/fpu: Make os_xrstor_booting() private [V2,20/30] x86/fpu: Move os_xsave() and os_xrstor() to core [V2,21/30] x86/fpu: Move legacy ASM wrappers to core [V2,22/30] x86/fpu: Make WARN_ON_FPU() private [V2,23/30] x86/fpu: Move fpregs_restore_userregs() to core [V2,24/30] x86/fpu: Move mxcsr related code to core [V2,25/30] x86/fpu: Move fpstate functions to api.h [V2,26/30] x86/fpu: Remove internal.h dependency from fpu/signal.h [V2,27/30] x86/sev: Include fpu/xcr.h [V2,28/30] x86/fpu: Mop up the internal.h leftovers [V2,29/30] x86/fpu: Replace the includes of fpu/internal.h [V2,30/30] x86/fpu: Provide a proper function for ex_handler_fprestore()

Commit Message

Thomas Gleixner Oct. 15, 2021, 1:15 a.m. UTC

PKRU code does not need anything from fpu headers. Include cpufeature.h
instead and fixup the resulting fallout in perf.

This is a preparation for FPU changes in order to prevent recursive include
hell.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/x86/events/perf_event.h | 1 +
 arch/x86/include/asm/pkru.h  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
---

diff mbox series

Patch

diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index e3ac05c97b5e..134c08df7340 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -14,6 +14,7 @@ 
 
 #include <linux/perf_event.h>
 
+#include <asm/fpu/xstate.h>
 #include <asm/intel_ds.h>
 #include <asm/cpu.h>
 
diff --git a/arch/x86/include/asm/pkru.h b/arch/x86/include/asm/pkru.h
index ccc539faa5bb..4cd49afa0ca4 100644
--- a/arch/x86/include/asm/pkru.h
+++ b/arch/x86/include/asm/pkru.h
@@ -2,7 +2,7 @@ 
 #ifndef _ASM_X86_PKRU_H
 #define _ASM_X86_PKRU_H
 
-#include <asm/fpu/xstate.h>
+#include <asm/cpufeature.h>
 
 #define PKRU_AD_BIT 0x1
 #define PKRU_WD_BIT 0x2