Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp2037516ybh; Fri, 17 Jul 2020 07:52:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCY4DGXHBIaNk2Je19zy4fqg3ZHCIevVA8gPFoZ83BR3BYUm2kr8Vf5BNGHRnLP4/8mziB X-Received: by 2002:a17:906:4a44:: with SMTP id a4mr6556100ejv.486.1594997523791; Fri, 17 Jul 2020 07:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594997523; cv=none; d=google.com; s=arc-20160816; b=oq+fFhPgckAKCzajRXOdI8bHZgpsGmMo08vsU9QX3x+7NWXGxS65nRWzEf0YvMlodX Zvx7uMriFVmSBdFcHU/ZIXtiH1DAXN0K93p7PrJCLcY8MGoB8RQmRk48LlJyzIHb1FTH 5DKK7o8ZLjvtu9YtssI24tjowjjLUd9wAIGm6nLjibKj3aUMu3fchgzNLqUDZmW2SsGz k98CFdChCvxGQdOWuP4/QK3jU5u0sNhWPQBz6A27/SYmnaGIrZl/6AqczEcgosB9wc+Z bHckLepfB8jkbbQrZn124SylY/kKmwrJ8IqWwb0I6FTVoNMQiQ4vTEjHpUtQTapoMKi7 c0FQ== 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=oJS0tirZMesZ2bSGiVgCu7JNP/r2oeUOXBLx71mvJ5w=; b=MP9KuIkdlFh+fekskfsfU0O1Q8CSyQohDvbSu2Gg+PO99mIw8Vhx0Ju9Q2TVpsVNfq CO52nKRZrEYImucrsSwqZVObeVkRTb7qRY0o7zNVrg2nkXlh42MMqtWCs2h4tg0/BzrX I/qB1MCKN+xJLIw5G4r+2jagyMhl05scbTLni3/zG/l/3xESfzIqzkVCOJfAs7mZxYJw wIsWB2n70PXvIykEW2cFkVJGelka6gj/hXxs+sIfIMybfrf2l1RimNkIwlbJrhNYOoux aDCYshARnOcnhxCS8/6EtCRm0nUcpu/10bQFG0r3+hvaxkx0004Q9eR+a7DoVqvKv7Bp h/vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=f7Ghbwz2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=L6ZOzxw3; 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 z4si4114809ejc.412.2020.07.17.07.51.40; Fri, 17 Jul 2020 07:52:03 -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=f7Ghbwz2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=L6ZOzxw3; 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 S1727101AbgGQOvQ (ORCPT + 99 others); Fri, 17 Jul 2020 10:51:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726938AbgGQOvL (ORCPT ); Fri, 17 Jul 2020 10:51:11 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61216C0619D4; Fri, 17 Jul 2020 07:51:11 -0700 (PDT) Date: Fri, 17 Jul 2020 14:51:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1594997469; 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=oJS0tirZMesZ2bSGiVgCu7JNP/r2oeUOXBLx71mvJ5w=; b=f7Ghbwz2fQ+OoBf939/MnNi5VLlwjs8TUC0uX1mAsIz9du/IFnWxTj34UunYXWLN2q1RP4 vDupZOk1YMZHerKFdrPyl/6u8abYhOsw15Lct5xotbBRf0GAingkPOcuJvvHrREaCqo/iC qV0nCNpnywGXNxYv4Tg3rCL4voJpy+XxRcBsxz/lQmHRFx4RIoWhgzntZPhHkbspnDBXeS j5J4TKcL89bXyJCvDs5hUw6Q0AD/JWoOETdG4jc9Kqt4KlOibDbbgGgt+LT/aRH12et1JY jrJYY4vZFXBUkcx6gslUagkOuJfYZB4vcG+6nLi+ryJ/TYXAQHb7MEhz9KrcHw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1594997469; 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=oJS0tirZMesZ2bSGiVgCu7JNP/r2oeUOXBLx71mvJ5w=; b=L6ZOzxw3ZdjhRzK7VPp1DPdBt8VnRv7OaM2sfDU9vxhPpiBtrTRapsbxjXGh3XEm3LkO1L 63nk2/UJavJckwCQ== 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 efi=old_map command line option Cc: Steve Wahl , Thomas Gleixner , Ard Biesheuvel , x86 , LKML In-Reply-To: <20200713212955.552098718@hpe.com> References: <20200713212955.552098718@hpe.com> MIME-Version: 1.0 Message-ID: <159499746888.4006.8703134748223983979.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: 3dad716240f95c3e6114965b8ea95018ef1b04c9 Gitweb: https://git.kernel.org/tip/3dad716240f95c3e6114965b8ea95018ef1b04c9 Author: steve.wahl@hpe.com AuthorDate: Mon, 13 Jul 2020 16:30:03 -05:00 Committer: Thomas Gleixner CommitterDate: Fri, 17 Jul 2020 16:47:46 +02:00 x86/platform/uv: Remove efi=old_map command line option As a part of UV1 platform removal, delete the efi=old_map option, which is not longer needed. Signed-off-by: Steve Wahl Signed-off-by: Thomas Gleixner Acked-by: Ard Biesheuvel Link: https://lkml.kernel.org/r/20200713212955.552098718@hpe.com --- arch/x86/platform/uv/bios_uv.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index 4494589..cd2a6e2 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -356,17 +356,3 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size, return (void __iomem *)__va(phys_addr); } - -static int __init arch_parse_efi_cmdline(char *str) -{ - if (!str) { - pr_warn("need at least one option\n"); - return -EINVAL; - } - - if (!efi_is_mixed() && parse_option_str(str, "old_map")) - set_bit(EFI_UV1_MEMMAP, &efi.flags); - - return 0; -} -early_param("efi", arch_parse_efi_cmdline);