[tip: x86/urgent] x86/cpuid: Remove transitional <asm/cpuid.h> header

From: tip-bot2 for Ahmed S. Darwish
Date: Fri Aug 15 2025 - 06:14:54 EST


The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: f6d34f02ebf8eb27f209efb821df998333a29339
Gitweb: https://git.kernel.org/tip/f6d34f02ebf8eb27f209efb821df998333a29339
Author: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
AuthorDate: Fri, 15 Aug 2025 09:01:54 +02:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Fri, 15 Aug 2025 11:46:47 +02:00

x86/cpuid: Remove transitional <asm/cpuid.h> header

All CPUID call sites were updated at commit:

968e30006807 ("x86/cpuid: Set <asm/cpuid/api.h> as the main CPUID header")

to include <asm/cpuid/api.h> instead of <asm/cpuid.h>.

The <asm/cpuid.h> header was still retained as a wrapper, just in case
some new code in -next started using it. Now that everything is merged
to Linus' tree, remove the header.

Signed-off-by: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://lore.kernel.org/20250815070227.19981-2-darwi@xxxxxxxxxxxxx
---
arch/x86/include/asm/cpuid.h | 8 --------
1 file changed, 8 deletions(-)
delete mode 100644 arch/x86/include/asm/cpuid.h

diff --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
deleted file mode 100644
index d5749b2..0000000
--- a/arch/x86/include/asm/cpuid.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#ifndef _ASM_X86_CPUID_H
-#define _ASM_X86_CPUID_H
-
-#include <asm/cpuid/api.h>
-
-#endif /* _ASM_X86_CPUID_H */