Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp2038222ybh; Fri, 17 Jul 2020 07:53:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKGJVz7F+2nITDOvARGqYC8BXuphEQxKRoyGz/U2NnkSOSnATBPGFFp1P1wk02c4eSPQwH X-Received: by 2002:a05:6402:1ac4:: with SMTP id ba4mr9264434edb.60.1594997589051; Fri, 17 Jul 2020 07:53:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594997589; cv=none; d=google.com; s=arc-20160816; b=UqzllcjGI2DRHR+hHrMRXTexj5JNOg1yVAZ/TwTtnGAUCxC5tVmD8MyjvFW+23xCiz SKgeG58ynGbfTb8fK4s6o4w1LfTQppNJQcuDZ32L6jHs5+WOtJlB0KlpEq+sk6y/oQpU vvukI+oGVcvkqVKjOubsy/CN/4aVJMhN9urf9OwxfBca7n728BfDPVqPaYUkR3KGULDG ty4RaPyU5ZcX1GZFDTZTDeEEhEp3LOs0GB65KBqyuGFr0ii7Eqd1TcB6wpj5msg8WJZ4 WzUvy1w4M7crgC7UelkKn2NLCmwQ9TZWlHiy5AGiwjMZy8Pu0Xye0cyaSWMUejWdDsiL kaXA== 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=sCV66bIWbj9bW/e9Rm/WFb+wjxpmEEgN/5RGLVTClm0=; b=lxZ87siPPyPchwKUnPJ75zKOYEUhSbk6aaLakba9eWFIRxfxP7zyIHHQGXTOMZ7Tzx ZH4G6TiIW/AjpF0Kc2XL4tu74T1ayF0RDto9fMWF6pol90suK5YGyWzgGpMMCxTxoGug 1xSJ3Rw/nsIbHj4XKNsWVRK11DGd7Q5EjQzGeMjP2ael5CVPDuOX3a39kdIdvwSCpAPi jajisPt7Ah/04zvBVIFZiSWAN9FjKRdGiKSyUh+jyW+wz/TiIBJcMrVPtHIqWskbrXqx f+IXGb7mkvzoMO9/pBMokLvhOUeWZ77S37aoKt8jF+ThTWj4RZPAjjQhFUr9YRPKeHoK o8+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=1f5yPvRb; dkim=neutral (no key) header.i=@vger.kernel.org header.s=2020e; 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 x6si5532493ejw.73.2020.07.17.07.52.46; Fri, 17 Jul 2020 07:53:09 -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=1f5yPvRb; dkim=neutral (no key) header.i=@vger.kernel.org header.s=2020e; 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 S1728033AbgGQOvn (ORCPT + 99 others); Fri, 17 Jul 2020 10:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727033AbgGQOvN (ORCPT ); Fri, 17 Jul 2020 10:51:13 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAD95C0619D4; Fri, 17 Jul 2020 07:51:12 -0700 (PDT) Date: Fri, 17 Jul 2020 14:51:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1594997470; 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=sCV66bIWbj9bW/e9Rm/WFb+wjxpmEEgN/5RGLVTClm0=; b=1f5yPvRb55wGM8RifZ8GNwkDXCdztVx5RqF8j/K+T+S+o1eyAFG+hPFxDtyA7MlIZkiqYz ELLGmhFyp9FQUFYUDqkvP6gcZB8hmwGPutdxjQAgTI6a9OT41ZW7QPQ9uFOMe4Y54uvjKw bbuu55099KRzyA5BDHfBXOi0kv4fDFLUbcg7h9rMW/va7rPrJzw4HghXAK9oUI6UQCXO3v STr702bQkF5BvXNXClDv8YnDgy+5PSoSs8FzEv51UdKal8HLRksMDjfZgNOkeuwc4SHXVF Tzrr0Ysz7IHr17b16b97E6KNDaKjPknEKRbom/Dna3y4+6k9esZh90Dm73KNJg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1594997470; 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=sCV66bIWbj9bW/e9Rm/WFb+wjxpmEEgN/5RGLVTClm0=; b=ketaDGn4H9IPsa8VxEIMY3VqRcjOrJg8i+E6rUgDZX13LgQAjBC/Jecd+VQ0elEdpEP7N7 viIhIRyGCEpowcCg== From: "tip-bot2 for steve.wahl@hpe.com" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Remove vestigial mention of UV1 platform from bios header Cc: Steve Wahl , Thomas Gleixner , x86 , LKML In-Reply-To: <20200713212955.435951508@hpe.com> References: <20200713212955.435951508@hpe.com> MIME-Version: 1.0 Message-ID: <159499746948.4006.1353014005142720587.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 X-Spam: Yes 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/platform branch of tip: Commit-ID: 5d662537510e09512e842b41352f8ad0427c1fe9 Gitweb: https://git.kernel.org/tip/5d662537510e09512e842b41352f8ad0427c1fe9 Author: steve.wahl@hpe.com AuthorDate: Mon, 13 Jul 2020 16:30:02 -05:00 Committer: Thomas Gleixner CommitterDate: Fri, 17 Jul 2020 16:47:46 +02:00 x86/platform/uv: Remove vestigial mention of UV1 platform from bios header Remove UV1 reference as UV1 is not longer supported by HPE. Signed-off-by: Steve Wahl Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20200713212955.435951508@hpe.com --- arch/x86/include/asm/uv/bios.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index 2fcc3ac..70050d0 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -72,7 +72,7 @@ struct uv_gam_range_entry { }; #define UV_SYSTAB_SIG "UVST" -#define UV_SYSTAB_VERSION_1 1 /* UV1/2/3 BIOS version */ +#define UV_SYSTAB_VERSION_1 1 /* UV2/3 BIOS version */ #define UV_SYSTAB_VERSION_UV4 0x400 /* UV4 BIOS base version */ #define UV_SYSTAB_VERSION_UV4_1 0x401 /* + gpa_shift */ #define UV_SYSTAB_VERSION_UV4_2 0x402 /* + TYPE_NVRAM/WINDOW/MBOX */