Commit 968e3000 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Ingo Molnar
Browse files

x86/cpuid: Set <asm/cpuid/api.h> as the main CPUID header 



The main CPUID header <asm/cpuid.h> was originally a storefront for the
headers:

    <asm/cpuid/api.h>
    <asm/cpuid/leaf_0x2_api.h>

Now that the latter CPUID(0x2) header has been merged into the former,
there is no practical difference between <asm/cpuid.h> and
<asm/cpuid/api.h>.

Migrate all users to the <asm/cpuid/api.h> header, in preparation of
the removal of <asm/cpuid.h>.

Don't remove <asm/cpuid.h> just yet, in case some new code in -next
started using it.

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarAhmed S. Darwish <darwi@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: x86-cpuid@lists.linux.dev
Link: https://lore.kernel.org/r/20250508150240.172915-3-darwi@linutronix.de
parent cdc8be31

arch/x86/boot/compressed/sev.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <asm/fpu/xcr.h>

#include <asm/ptrace.h>

#include <asm/svm.h>

#include <asm/cpuid.h>

#include <asm/cpuid/api.h>



#include "error.h"

#include "sev.h"

arch/x86/boot/startup/sev-startup.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/apic.h>

#include <asm/cpuid.h>

#include <asm/cpuid/api.h>

#include <asm/cmdline.h>



/* For early boot hypervisor communication in SEV-ES enabled guests */

arch/x86/coco/sev/core.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/apic.h>

#include <asm/cpuid.h>

#include <asm/cpuid/api.h>

#include <asm/cmdline.h>

#include <asm/msr.h>

arch/x86/coco/sev/vc-handle.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/apic.h>

#include <asm/cpuid.h>

#include <asm/cpuid/api.h>



static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt *ctxt,

					   unsigned long vaddr, phys_addr_t *paddr)

arch/x86/events/intel/pt.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/slab.h>

#include <linux/device.h>



#include <asm/cpuid.h>

#include <asm/cpuid/api.h>

#include <asm/perf_event.h>

#include <asm/insn.h>

#include <asm/io.h>