From patchwork Thu Sep 2 21:50:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12472637 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 C28B7C433F5 for ; Thu, 2 Sep 2021 21:50:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4ACC060F12 for ; Thu, 2 Sep 2021 21:50:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4ACC060F12 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 E736C6B0073; Thu, 2 Sep 2021 17:50:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E21536B0074; Thu, 2 Sep 2021 17:50:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEA778D0001; Thu, 2 Sep 2021 17:50:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id C16556B0073 for ; Thu, 2 Sep 2021 17:50:03 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8097F18454A59 for ; Thu, 2 Sep 2021 21:50:03 +0000 (UTC) X-FDA: 78543976686.34.03985DF Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf02.hostedemail.com (Postfix) with ESMTP id 39F057001A0A for ; Thu, 2 Sep 2021 21:50:03 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 2E8A6610A0; Thu, 2 Sep 2021 21:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1630619402; bh=5AjqKVEFTPxftISxRsVwzVkw7/cenVskMEX0FwhlsE4=; h=Date:From:To:Subject:In-Reply-To:From; b=eoZw6yZS+BDmSKzy0sICf2/2pNsx1H1xI2NmxZWu1aZIjtp9O8tSE5y1cTFZ533ra Jk0iwU7pVfpNtvWC2mcoGEw1WgXiIeEojBY5yzQ6yIymNXWvI19IAyYIw+17o8uaaX KY4npmwIJhd7jSlGbbXtBxwwWrStvo5PURBHH6NI= Date: Thu, 02 Sep 2021 14:50:01 -0700 From: Andrew Morton To: akpm@linux-foundation.org, frowand.list@gmail.com, geert+renesas@glider.be, horms@verge.net.au, jlan@sgi.com, linux-mm@kvack.org, magnus.damm@gmail.com, mm-commits@vger.kernel.org, robh+dt@kernel.org, rppt@linux.vnet.ibm.com, tony.luck@intel.com, torvalds@linux-foundation.org Subject: [patch 002/212] ia64: fix #endif comment for reserve_elfcorehdr() Message-ID: <20210902215001.4qUF6e279%akpm@linux-foundation.org> In-Reply-To: <20210902144820.78957dff93d7bea620d55a89@linux-foundation.org> User-Agent: s-nail v14.8.16 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=eoZw6yZS; spf=pass (imf02.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 39F057001A0A X-Stat-Signature: cr48wdfa9pcfqmbpee4a6bpzixnjptgy X-HE-Tag: 1630619403-480252 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: Geert Uytterhoeven Subject: ia64: fix #endif comment for reserve_elfcorehdr() Patch series "ia64: Miscellaneous fixes and cleanups". This patch series contains some miscellaneous fixes and cleanups for ia64. The second patch fixes a naming conflict triggered by a patch for the FDT code. This patch (of 3): The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not CONFIG_PROC_VMCORE. Link: https://lkml.kernel.org/r/cover.1629884459.git.geert+renesas@glider.be Link: https://lkml.kernel.org/r/77b4c0648f200cab7e1c2c5171c06763e09362aa.1629884459.git.geert+renesas@glider.be Fixes: d9a9855d0b06ca6d ("always reserve elfcore header memory in crash kernel") Fixes: 17c1f07ed70afa4f ("[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP") Signed-off-by: Geert Uytterhoeven Cc: Simon Horman Cc: Tony Luck Cc: Jay Lan Cc: Magnus Damm Cc: Mike Rapoport Cc: Rob Herring Cc: Frank Rowand Signed-off-by: Andrew Morton --- arch/ia64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/ia64/kernel/setup.c~ia64-fix-endif-comment-for-reserve_elfcorehdr +++ a/arch/ia64/kernel/setup.c @@ -546,7 +546,7 @@ int __init reserve_elfcorehdr(u64 *start return 0; } -#endif /* CONFIG_PROC_VMCORE */ +#endif /* CONFIG_CRASH_DUMP */ void __init setup_arch (char **cmdline_p)