From patchwork Mon Oct 18 22:16:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12568203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 947D6C43217 for ; Mon, 18 Oct 2021 22:16:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 46277610FB for ; Mon, 18 Oct 2021 22:16:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 46277610FB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id E5E84940011; Mon, 18 Oct 2021 18:16:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE759940007; Mon, 18 Oct 2021 18:16:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAF73940011; Mon, 18 Oct 2021 18:16:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0076.hostedemail.com [216.40.44.76]) by kanga.kvack.org (Postfix) with ESMTP id B3198940007 for ; Mon, 18 Oct 2021 18:16:11 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 754CF2DECA for ; Mon, 18 Oct 2021 22:16:11 +0000 (UTC) X-FDA: 78710967342.27.E4AC406 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf20.hostedemail.com (Postfix) with ESMTP id 63E6CD0000B0 for ; Mon, 18 Oct 2021 22:16:08 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 04B6660F57; Mon, 18 Oct 2021 22:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1634595370; bh=Yz2lCk1Gf5tedBMNA+38DGAKcpNnkhSAKgZ0A5gvbh0=; h=Date:From:To:Subject:In-Reply-To:From; b=GMQ4t42U7CC/bxhAiH0AA6UqQqMIma1TqkHM4nyvWu56GJ1RWbmTlOsv/FTDKnLke hD87i5LWDVgcKY00Q62NMyt5Bur6gESg0dZI90nQDnVx2X6HBfDXjZKyJ+LOmTN01Y I+hvgaEW5cW218FL3Lj3a01veubK7qVkX1CwM8bQ= Date: Mon, 18 Oct 2021 15:16:09 -0700 From: Andrew Morton To: akpm@linux-foundation.org, arnd@arndb.de, brho@google.com, catalin.marinas@arm.com, linux-mm@kvack.org, lukas.bulwahn@gmail.com, mm-commits@vger.kernel.org, nathan@kernel.org, ndesaulniers@google.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 15/19] elfcore: correct reference to CONFIG_UML Message-ID: <20211018221609.zmtVj1PE3%akpm@linux-foundation.org> In-Reply-To: <20211018151438.f2246e2656c041b6753a8bdd@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: 63E6CD0000B0 X-Stat-Signature: 175oyfcirgzg7md5718cgckpdkcu473x Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=GMQ4t42U; dmarc=none; spf=pass (imf20.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Rspamd-Server: rspam02 X-HE-Tag: 1634595368-155397 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Lukas Bulwahn Subject: elfcore: correct reference to CONFIG_UML Commit 6e7b64b9dd6d ("elfcore: fix building with clang") introduces special handling for two architectures, ia64 and User Mode Linux. However, the wrong name, i.e., CONFIG_UM, for the intended Kconfig symbol for User-Mode Linux was used. Although the directory for User Mode Linux is ./arch/um; the Kconfig symbol for this architecture is called CONFIG_UML. Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs: UM Referencing files: include/linux/elfcore.h Similar symbols: UML, NUMA Correct the name of the config to the intended one. [akpm@linux-foundation.org: fix um/x86_64, per Catalin] Link: https://lkml.kernel.org/r/20211006181119.2851441-1-catalin.marinas@arm.com Link: https://lkml.kernel.org/r/YV6pejGzLy5ppEpt@arm.com Link: https://lkml.kernel.org/r/20211006082209.417-1-lukas.bulwahn@gmail.com Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang") Signed-off-by: Lukas Bulwahn Cc: Arnd Bergmann Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Catalin Marinas Cc: Barret Rhoden Cc: Signed-off-by: Andrew Morton --- include/linux/elfcore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/elfcore.h~elfcore-correct-reference-to-config_uml +++ a/include/linux/elfcore.h @@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpr #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