From: "tip-bot2 for Lukas Bulwahn" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>,
Borislav Petkov <bp@suse.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/build: Use the proper name CONFIG_FW_LOADER
Date: Wed, 29 Dec 2021 21:29:08 -0000 [thread overview]
Message-ID: <164081334864.16921.320515650534204653.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211229111553.5846-1-lukas.bulwahn@gmail.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d6f12f83989bb356ac6880a954f62c7667e35066
Gitweb: https://git.kernel.org/tip/d6f12f83989bb356ac6880a954f62c7667e35066
Author: Lukas Bulwahn <lukas.bulwahn@gmail.com>
AuthorDate: Wed, 29 Dec 2021 12:15:53 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 29 Dec 2021 22:20:38 +01:00
x86/build: Use the proper name CONFIG_FW_LOADER
Commit in Fixes intends to add the expression regex only when FW_LOADER
is enabled - not FW_LOADER_BUILTIN. Latter is a leftover from a previous
patchset and not a valid config item.
So, adjust the condition to the actual name of the config.
[ bp: Cleanup commit message. ]
Fixes: c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20211229111553.5846-1-lukas.bulwahn@gmail.com
---
arch/x86/tools/relocs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index c736cf2..e2c5b29 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
"(__parainstructions|__alt_instructions)(_end)?|"
"(__iommu_table|__apicdrivers|__smp_locks)(_end)?|"
"__(start|end)_pci_.*|"
-#if CONFIG_FW_LOADER_BUILTIN
+#if CONFIG_FW_LOADER
"__(start|end)_builtin_fw|"
#endif
"__(start|stop)___ksymtab(_gpl)?|"
prev parent reply other threads:[~2021-12-29 21:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-29 11:15 [PATCH] x86/build: use " Lukas Bulwahn
2021-12-29 14:16 ` Greg Kroah-Hartman
2021-12-29 19:36 ` Borislav Petkov
2021-12-30 9:29 ` Greg Kroah-Hartman
2021-12-29 21:29 ` tip-bot2 for Lukas Bulwahn [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=164081334864.16921.320515650534204653.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=x86@kernel.org \
/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®