Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1800596pxa; Thu, 6 Aug 2020 16:44:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzc7zFQp9czlT0P+30d8VizEnfGRI4uJH0tX/59s9pLSJUEJk9yZqr9lU8Stk5jDgucsqxl X-Received: by 2002:aa7:d654:: with SMTP id v20mr6419998edr.314.1596757456767; Thu, 06 Aug 2020 16:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596757456; cv=none; d=google.com; s=arc-20160816; b=hRYK79UZ+MGbWBq9FWGi2VRZZw9Wyac3HS6KNVZ0Qj2nYxft28z6qSjQlTbQCcxMfW By3f9WNPjIJzsfzwd6YT5zhJ+nTWrzwPTubKvqlcZ9x+ary+A7lpjWbdvKSkEE81JlwF ePtb2uGhNkqy0Ska2RNXw5s8VsoL6hAZMvof1BLVrNAr5A6pRo+e35adQ/VmLlLKfLBR 1BY2cW0fMCdv9lr6UjiJqk8NpGik0eIfrTbO+zKV8CFErxDeYp50KjX7T2y1v0edjtWJ XL3dfxqNaMoc2vncvuaxTsofCbxnhO4QyjREcFJX6g8OGccCUZStitsLzMKwezemmhg1 Srcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=sbU1C4X0lV1GN1HcFt4QXmWuuCwiwsFzKG3FgR70TE4=; b=wjmOZzW3TvEuYKBHsaF8GSMYLJSEIYtRkKQGueOSdL0Fgrv1VRvjF2EGztdKm0GYtO OeU+UMpCCeN8G2Irs3jnoFHqAI3O3Ja341xH9oKxVTpfaT19qGn7Xr3uYeaA/K/mee+A QuAMJ3NqunPF2VL/Vi217wf97gTqvgqjt0pe4AL/NsAxZY3OEpb5kf1jHk1iCU59QuF1 zFx01/mUBXS262+mDZmajiRtC6Oi02brLHpWVelHmq9uZTsKoQUmUEqiu6t87PYafND8 cVaSyE9IS/PfMB4oVfwrrnI3NqtILNayZeRmUC5n+sASy8y14/sPXtKslOhZc5Es4bMz 4uAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=QhUCUpWm; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=3LJkmTo2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jp21si4324311ejb.136.2020.08.06.16.43.51; Thu, 06 Aug 2020 16:44:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=QhUCUpWm; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=3LJkmTo2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727792AbgHFXke (ORCPT + 99 others); Thu, 6 Aug 2020 19:40:34 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60902 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726442AbgHFXit (ORCPT ); Thu, 6 Aug 2020 19:38:49 -0400 Date: Thu, 06 Aug 2020 23:38:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1596757127; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sbU1C4X0lV1GN1HcFt4QXmWuuCwiwsFzKG3FgR70TE4=; b=QhUCUpWmK/l7cpdUOGzDeTKeql+ZZuK17qZHhSemGVYfOcwWZpN04t/IqYbcaDECG3FAyO RQ0vk7NcK8zBK6hDpBA6FnhLyue6tsQLYQlh536Jda7x8l8qMGbQgSa2L1QHJzjxEEf6L0 iCvFFIM0RB5vYohvNJZHcYmRoIhf1WEQqQmFIJXrED/qfSzD0M8LtCBIL8MBdXOHgIAedN RiqFUYJlxgWzCqmr+Iyy1anJjgHBo0RXxu/BHn983/GIDxldQLBpHusMPTYMuvIzb7xD90 FJIlrCqoR+vUjCx8ydWIbjmdldRQuqxJElt3tfVmlQe8oYZoxZ4eTZR4K7O9Ew== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1596757127; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sbU1C4X0lV1GN1HcFt4QXmWuuCwiwsFzKG3FgR70TE4=; b=3LJkmTo2IPV1YI8ga4aI9BkHsxPC36FlLEVXIrByH79VYvAHnpucbnGHcQ1Cp1Bq+xwGeV VI+lMvvEmwpNvOBg== From: "tip-bot2 for Shuo Liu" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/acrn: Remove redundant chars from ACRN signature Cc: Shuo Liu , Ingo Molnar , Reinette Chatre , x86 , LKML In-Reply-To: <20200806114111.9448-1-shuo.a.liu@intel.com> References: <20200806114111.9448-1-shuo.a.liu@intel.com> MIME-Version: 1.0 Message-ID: <159675712671.3192.9044142725285189361.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 AuthorDate: Thu, 06 Aug 2020 19:41:11 +08:00 Committer: Ingo Molnar 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 Signed-off-by: Ingo Molnar Reviewed-by: Reinette Chatre Link: https://lore.kernel.org/r/20200806114111.9448-1-shuo.a.liu@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 #include -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)