From: Catalin Marinas <catalin.marinas@arm.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org,
Nathan Chancellor <natechancellor@gmail.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Barret Rhoden <brho@google.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] elfcore: um: Fix CONFIG_UM typo in linux/elfcore.h
Date: Wed, 6 Oct 2021 19:11:19 +0100 [thread overview]
Message-ID: <20211006181119.2851441-1-catalin.marinas@arm.com> (raw)
There is no CONFIG_UM, only UML. In addition, the arch/x86/um/elfcore.c
file is only compiled if CONFIG_X86_32. Fix the #if conditions in the
linux/elfcore.h header accordingly.
Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
---
I'm doing some arm64 changes to allow MTE tags to be dumped in the core
file and I came across this. In a subsequent patch I'll change the #if
check with a dedicated Kconfig option but I thought I'd send the fix
first in case anyone deems it important to backport.
include/linux/elfcore.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 2aaa15779d50..957ebec35aad 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_reg
#endif
}
-#if defined(CONFIG_UM) || defined(CONFIG_IA64)
+#if (defined(CONFIG_UML) && defined(CONFIG_X86_32)) || defined(CONFIG_IA64)
/*
* These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out
* extra segments containing the gate DSO contents. Dumping its
next reply other threads:[~2021-10-06 18:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 18:11 Catalin Marinas [this message]
2021-10-06 21:57 ` Nick Desaulniers
2021-10-07 0:57 ` Andrew Morton
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=20211006181119.2851441-1-catalin.marinas@arm.com \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=brho@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
/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®