The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 4c7bfa383efd837d4ab8f86ef05886959ed8bfe5 Gitweb: https://git.kernel.org/tip/4c7bfa383efd837d4ab8f86ef05886959ed8bfe5 Author: Shuo Liu <shuo.a....@intel.com> AuthorDate: Thu, 06 Aug 2020 19:41:11 +08:00 Committer: Ingo Molnar <mi...@kernel.org> CommitterDate: Fri, 07 Aug 2020 01:32:00 +02:00
x86/acrn: Remove redundant chars from ACRN signature hypervisor_cpuid_base() only handles 12 chars of the hypervisor signature string but is provided with 14 chars. Remove the redundancy. Additionally, replace the user space uint32_t with preferred kernel type u32. Signed-off-by: Shuo Liu <shuo.a....@intel.com> Signed-off-by: Ingo Molnar <mi...@kernel.org> Reviewed-by: Reinette Chatre <reinette.cha...@intel.com> Link: https://lore.kernel.org/r/20200806114111.9448-1-shuo.a....@intel.com --- arch/x86/kernel/cpu/acrn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/acrn.c b/arch/x86/kernel/cpu/acrn.c index 3b08cdf..0b2c039 100644 --- a/arch/x86/kernel/cpu/acrn.c +++ b/arch/x86/kernel/cpu/acrn.c @@ -17,9 +17,9 @@ #include <asm/idtentry.h> #include <asm/irq_regs.h> -static uint32_t __init acrn_detect(void) +static u32 __init acrn_detect(void) { - return hypervisor_cpuid_base("ACRNACRNACRN\0\0", 0); + return hypervisor_cpuid_base("ACRNACRNACRN", 0); } static void __init acrn_init_platform(void)
