Re: [PATCH v1 2/9] x86/cpuid: Set <asm/cpuid/api.h> as the main CPUID header

* Ahmed S. Darwish <[email protected]> wrote:

> 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>
> 
> Remove <asm/cpuid.h> and let all call-sites directly include
> <asm/cpuid/api.h>.
> 
> Suggested-by: Ingo Molnar <[email protected]>
> Signed-off-by: Ahmed S. Darwish <[email protected]>

> diff --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
> deleted file mode 100644
> index d5749b25fa10..000000000000
> --- 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 */

Note that in the tip:x86/core commit I've applied today I've delayed 
this removal of <asm/cpuid.h>, in case there's something in -next that 
started using it. I've adjusted the changelog accordingly.

We can remove it later on, shortly after -rc1 or so.

Thanks,

	Ingo