From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02912C433E1 for ; Thu, 6 Aug 2020 17:11:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A66723119 for ; Thu, 6 Aug 2020 17:11:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="SllTpQ7Q"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="i3Z1KHO6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730289AbgHFRLb (ORCPT ); Thu, 6 Aug 2020 13:11:31 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:58908 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730225AbgHFRKK (ORCPT ); Thu, 6 Aug 2020 13:10:10 -0400 Date: Thu, 06 Aug 2020 17:10:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1596733808; 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=WQH2Dp4SmDRt2hnEhmdeULpbvWsMlxaGTDuizm9AoSE=; b=SllTpQ7Qjn9e42gYzRnnC7WDLEefYe0Dek4Dg7dQwskM7arCk5gufhZ20K+o4dfKBIFv2Q Gvy1F7RaZGzEfOqvpChqwe2BDQSyNKbYiS9lP7PHdgRcwQsHIg4K+ibggcyxmf36HpdOuX JWT29w7nnMyd+BuLvL251Iegd9zL/T5x9DKjfwgxbKGUxnMg2+J3N4T0rTd0pqBNRX3fEX JWajZlQm79jjOlBL3jfLeAt/wCzuNjl521OUjfXqBBgiDN3ZGQHs4N2EXlPCbyKq7d0rtU PCIqiI0UvJPNHRCLXL1rnwUKUGchKjElCqgINNWK4EMR+mENjUZlhJvqPVxENA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1596733808; 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=WQH2Dp4SmDRt2hnEhmdeULpbvWsMlxaGTDuizm9AoSE=; b=i3Z1KHO6anSasofqAVYib32PqQZrqrJKFKjKyDV+6yGcIUqvarP/QPd7wrzViwkxHt8Oxa h8W4pgrnDZKkZVDw== 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: <159673380822.3192.4360040781044102948.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: d60ed6f07c9c8ed2cbdacea7ab9597ad81454545 Gitweb: https://git.kernel.org/tip/d60ed6f07c9c8ed2cbdacea7ab9597ad81454545 Author: Shuo Liu AuthorDate: Thu, 06 Aug 2020 19:41:11 +08:00 Committer: Ingo Molnar CommitterDate: Thu, 06 Aug 2020 15:20:17 +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)