Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-27 06:50:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo 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
This commit is contained in:
Ahmed S. Darwish 2025-05-08 17:02:31 +02:00 committed by Ingo Molnar
parent cdc8be31cb
commit 968e300068
24 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/compressed/sev.c
View File

@ -21,7 +21,7 @@
#include <asm/fpu/xcr.h> #include <asm/fpu/xcr.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/svm.h> #include <asm/svm.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include "error.h" #include "error.h"
#include "sev.h" #include "sev.h"

2
arch/x86/boot/startup/sev-startup.c
View File

@ -38,7 +38,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/cmdline.h> #include <asm/cmdline.h>
/* For early boot hypervisor communication in SEV-ES enabled guests */ /* For early boot hypervisor communication in SEV-ES enabled guests */

2
arch/x86/coco/sev/core.c
View File

@ -42,7 +42,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/cmdline.h> #include <asm/cmdline.h>
#include <asm/msr.h> #include <asm/msr.h>

2
arch/x86/coco/sev/vc-handle.c
View File

@ -32,7 +32,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/apic.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, static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt *ctxt,
unsigned long vaddr, phys_addr_t *paddr) unsigned long vaddr, phys_addr_t *paddr)

2
arch/x86/events/intel/pt.c
View File

@ -18,7 +18,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/device.h> #include <linux/device.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/perf_event.h> #include <asm/perf_event.h>
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/io.h> #include <asm/io.h>

2
arch/x86/include/asm/processor.h
View File

@ -16,7 +16,7 @@ struct vm86;
#include <uapi/asm/sigcontext.h> #include <uapi/asm/sigcontext.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable_types.h> #include <asm/pgtable_types.h>
#include <asm/percpu.h> #include <asm/percpu.h>

2
arch/x86/kernel/acpi/cstate.c
View File

@ -14,7 +14,7 @@
#include <acpi/processor.h> #include <acpi/processor.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/mwait.h> #include <asm/mwait.h>
#include <asm/special_insns.h> #include <asm/special_insns.h>
#include <asm/smp.h> #include <asm/smp.h>

2
arch/x86/kernel/amd_nb.c
View File

@ -15,7 +15,7 @@
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <asm/amd/nb.h> #include <asm/amd/nb.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
static u32 *flush_words; static u32 *flush_words;

2
arch/x86/kernel/cpu/cacheinfo.c
View File

@ -16,7 +16,7 @@
#include <asm/amd/nb.h> #include <asm/amd/nb.h>
#include <asm/cacheinfo.h> #include <asm/cacheinfo.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>

2
arch/x86/kernel/cpu/common.c
View File

@ -29,7 +29,7 @@
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/cmdline.h> #include <asm/cmdline.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/perf_event.h> #include <asm/perf_event.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/doublefault.h> #include <asm/doublefault.h>

2
arch/x86/kernel/cpu/intel.c
View File

@ -16,7 +16,7 @@
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/hwcap2.h> #include <asm/hwcap2.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/microcode.h> #include <asm/microcode.h>

2
arch/x86/kernel/fpu/xstate.c
View File

@ -21,7 +21,7 @@
#include <asm/fpu/signal.h> #include <asm/fpu/signal.h>
#include <asm/fpu/xcr.h> #include <asm/fpu/xcr.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/prctl.h> #include <asm/prctl.h>

2
arch/x86/kernel/hpet.c
View File

@ -7,7 +7,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/irq_remapping.h> #include <asm/irq_remapping.h>
#include <asm/hpet.h> #include <asm/hpet.h>
#include <asm/time.h> #include <asm/time.h>

2
arch/x86/kernel/process.c
View File

@ -30,7 +30,7 @@
#include <linux/hw_breakpoint.h> #include <linux/hw_breakpoint.h>
#include <linux/entry-common.h> #include <linux/entry-common.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/mwait.h> #include <asm/mwait.h>

2
arch/x86/kernel/smpboot.c
View File

@ -64,7 +64,7 @@
#include <asm/acpi.h> #include <asm/acpi.h>
#include <asm/cacheinfo.h> #include <asm/cacheinfo.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/irq.h> #include <asm/irq.h>

2
arch/x86/kernel/tsc.c
View File

@ -16,7 +16,7 @@
#include <linux/static_key.h> #include <linux/static_key.h>
#include <linux/static_call.h> #include <linux/static_call.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/hpet.h> #include <asm/hpet.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/vgtod.h> #include <asm/vgtod.h>

2
arch/x86/kvm/cpuid.c
View File

@ -21,7 +21,7 @@
#include <asm/user.h> #include <asm/user.h>
#include <asm/fpu/xstate.h> #include <asm/fpu/xstate.h>
#include <asm/sgx.h> #include <asm/sgx.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include "cpuid.h" #include "cpuid.h"
#include "lapic.h" #include "lapic.h"
#include "mmu.h" #include "mmu.h"

2
arch/x86/virt/svm/sev.c
View File

@ -27,7 +27,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/cmdline.h> #include <asm/cmdline.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/msr.h> #include <asm/msr.h>

2
arch/x86/xen/enlighten_pv.c
View File

@ -49,7 +49,7 @@
#include <xen/hvc-console.h> #include <xen/hvc-console.h>
#include <xen/acpi.h> #include <xen/acpi.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/paravirt.h> #include <asm/paravirt.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/page.h> #include <asm/page.h>

2
drivers/acpi/acpi_pad.c
View File

@ -19,7 +19,7 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/mwait.h> #include <asm/mwait.h>
#include <xen/xen.h> #include <xen/xen.h>

2
drivers/dma/ioat/dca.c
View File

@ -10,7 +10,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dca.h> #include <linux/dca.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
/* either a kernel change is needed, or we need something like this in kernel */ /* either a kernel change is needed, or we need something like this in kernel */
#ifndef CONFIG_SMP #ifndef CONFIG_SMP

2
drivers/idle/intel_idle.c
View File

@ -51,7 +51,7 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/mwait.h> #include <asm/mwait.h>

2
drivers/platform/x86/intel/pmc/core.c
View File

@ -22,7 +22,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/units.h> #include <linux/units.h>
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/msr.h> #include <asm/msr.h>

2
sound/soc/intel/avs/tgl.c
View File

@ -47,7 +47,7 @@ static int avs_tgl_config_basefw(struct avs_dev *adev)
#ifdef CONFIG_X86 #ifdef CONFIG_X86
unsigned int ecx; unsigned int ecx;
#include <asm/cpuid.h> #include <asm/cpuid/api.h>
ecx = cpuid_ecx(CPUID_TSC_LEAF); ecx = cpuid_ecx(CPUID_TSC_LEAF);
if (ecx) { if (ecx) {
ret = avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(ecx), &ecx); ret = avs_ipc_set_fw_config(adev, 1, AVS_FW_CFG_XTAL_FREQ_HZ, sizeof(ecx), &ecx);