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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 86F31C2D0DB for ; Wed, 22 Jan 2020 19:15:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5929A21835 for ; Wed, 22 Jan 2020 19:15:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="J7d0NSFA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728809AbgAVTPB (ORCPT ); Wed, 22 Jan 2020 14:15:01 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:36907 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726004AbgAVTPB (ORCPT ); Wed, 22 Jan 2020 14:15:01 -0500 Received: by mail-qt1-f193.google.com with SMTP id w47so466160qtk.4 for ; Wed, 22 Jan 2020 11:15:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wcZLBHfSelzBLql9iR2p8F2YLeGA3mb8mja49ZN5f84=; b=J7d0NSFAdOvdf1j3I+XMD9gglB+MgxwDGbKrjQxGqVjK7ZlWBJe3XlQ+UM2YPmX2ey 2pC5v5rFRhefoIv1YdWzENhSjJ4RIbI9phPgOlr12qlSaQKqBtrryWzNBK2rFIbd2wZh 3MBH72tqFRpSsTashv+5PBH00zJhhzfZkzGxzB8McWgRVSi1ZUl4yGC3TzJXY+QcnYih 8ePmwtMbjp4HR8G3S1O/s3FUWD1qpvZ5Z/tBNeWASu8vQz/1uvuMIXRV4r0IGwHaA1tf rGQjJpQe0rAG3jBAskRX6lg8oelt5D3h1DRvD84WAZGB7dtlzRwDQPp0RpMlYPrGxJO5 GNJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wcZLBHfSelzBLql9iR2p8F2YLeGA3mb8mja49ZN5f84=; b=GJkOfiI9iESsJDxHpa+DgavbCXkf9vQ3rx1AAaQyz1/SYQNH6Rj7Mt4iGXQavy0k/I V5Uv+tZ2qsDHxBiYktRn3aElC1KvKufLHUcHgmHHJ1QVeIdcAjH4I39RRVcoUIXBK5wv Pb6jVXDU42HXiuoAezeXgyVzx2TmMVZb/PqS16Yj8SWULCThArGKRa6GEkdy8gpasZJl gL6ht5OyHBW4d/qeyhE9kVVzTc5IlRoZGIqSQoPRwFgqgqDsVs3GZNRybxJQtx6PGTMo MFaB3vQr7ZTCaE5XEOkhO9L05S9w8DfFU8GXKH2BxaBWcWgFhwRdqLDVkaqQniv2QtkS Cy8A== X-Gm-Message-State: APjAAAWkBpN79q6i/Yk2DNg47pY9PW+m1NwL4NUdOflIt6LCjQF4XX4Q vBo4ug1SmjdZskRzsFEyzeLzdBjbvpekwQ== X-Google-Smtp-Source: APXvYqwF1rSoKbNyZjLl+is8u3JtESZR7y/+4GcKotqz8S/YtN8UZsOQ4+qJJ4ecO/nonjUj8cWmvw== X-Received: by 2002:ac8:2e4b:: with SMTP id s11mr12035146qta.389.1579720499968; Wed, 22 Jan 2020 11:14:59 -0800 (PST) Received: from ovpn-123-97.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id k50sm21675998qtc.90.2020.01.22.11.14.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jan 2020 11:14:59 -0800 (PST) From: Qian Cai To: mingo@redhat.com Cc: ardb@kernel.org, tglx@linutronix.de, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] efi/libstub/x86: fix an EFI server boot failure Date: Wed, 22 Jan 2020 14:14:30 -0500 Message-Id: <20200122191430.4888-1-cai@lca.pw> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org x86_64 EFI systems are unable to boot due to a typo in the recent commit. EFI config tables not found. -- System halted Fixes: 796eb8d26a57 ("efi/libstub/x86: Use const attribute for efi_is_64bit()") Signed-off-by: Qian Cai --- arch/x86/boot/compressed/eboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 82e26d0ff075..287393d725f0 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -32,7 +32,7 @@ __attribute_const__ bool efi_is_64bit(void) { if (IS_ENABLED(CONFIG_EFI_MIXED)) return efi_is64; - return IS_ENABLED(CONFIG_X64_64); + return IS_ENABLED(CONFIG_X86_64); } static efi_status_t -- 2.21.0 (Apple Git-122.2)