From: "tip-bot2 for Heinrich Schuchardt" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Ard Biesheuvel <ardb@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: efi/core] efi/libstub/x86: simplify efi_is_native()
Date: Tue, 17 Nov 2020 18:03:10 -0000 [thread overview]
Message-ID: <160563619080.11244.12370946188022666812.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201003060356.4913-1-xypron.glpk@gmx.de>
The following commit has been merged into the efi/core branch of tip:
Commit-ID: bc13809f1c47245cd584f4ad31ad06a5c5f40e54
Gitweb: https://git.kernel.org/tip/bc13809f1c47245cd584f4ad31ad06a5c5f40e54
Author: Heinrich Schuchardt <xypron.glpk@gmx.de>
AuthorDate: Sat, 03 Oct 2020 08:03:56 +02:00
Committer: Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Mon, 26 Oct 2020 08:06:36 +01:00
efi/libstub/x86: simplify efi_is_native()
CONFIG_EFI_MIXED depends on CONFIG_X86_64=y.
There is no need to check CONFIG_X86_64 again.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Link: https://lore.kernel.org/r/20201003060356.4913-1-xypron.glpk@gmx.de
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
arch/x86/include/asm/efi.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index bc9758e..7673dc8 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -213,8 +213,6 @@ static inline bool efi_is_64bit(void)
static inline bool efi_is_native(void)
{
- if (!IS_ENABLED(CONFIG_X86_64))
- return true;
return efi_is_64bit();
}
prev parent reply other threads:[~2020-11-17 18:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-03 6:03 [PATCH 1/1] " Heinrich Schuchardt
2020-10-03 17:28 ` Brian Gerst
2020-10-03 19:44 ` Arvind Sankar
2020-10-04 14:14 ` Ard Biesheuvel
2020-10-04 14:40 ` Arvind Sankar
2020-11-17 18:03 ` tip-bot2 for Heinrich Schuchardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160563619080.11244.12370946188022666812.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ardb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®