From patchwork Mon Jul 10 12:56:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioanna Alifieraki X-Patchwork-Id: 1805808 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gQQRcoAx; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R03sv1x9Cz242W for ; Mon, 10 Jul 2023 22:56:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qIqRA-0000lq-Iv; Mon, 10 Jul 2023 12:56:20 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qIqR9-0000ke-8J for kernel-team@lists.ubuntu.com; Mon, 10 Jul 2023 12:56:19 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 9CB6A3F16E for ; Mon, 10 Jul 2023 12:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1688993776; bh=yAyWBajsVg31KJAXi3rd9oBptLUL4WqyzBif5ksLxak=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gQQRcoAxJs8gfCPvqQNM16R9Afuo2TuZRLTeAh9KMU/gxkJ11A30mLA4BR5hBbUYG DfHmsLHWC+9nXmF/zcTYS+fLTqoZ5jXTFBk1XUcEKP7qsqStgt3Pq9pTJxxlvlForo +yLS2nACpavtcDWZrsnuuHnhRXPbMUu6nSLZga2ZhglPVUI/01//kmrO/HckrRy4b5 2PUtTFHvhJM+CpFDZR8An4QXKIAiElXfkG5Vgcesmwm80MgPCbd4Vx3jfGkv8FhFQ3 M8UHl+i3MWSJp98S96Vu1cGnq/qCfRbjVR3CI4XNnkbz/WQeK0TZU0vNEPeti755Uo Mggbvm+GWueGw== Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-977e6c94186so287868866b.1 for ; Mon, 10 Jul 2023 05:56:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688993775; x=1691585775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yAyWBajsVg31KJAXi3rd9oBptLUL4WqyzBif5ksLxak=; b=PLZqLLutQqklOp+2TrAftzffyyqjOwGLAKnLGkS1xT+z7nYzi6LnfWW43jCNpcbu+T koIUiDvcIqo6zC6binNw+QvQko8mxniXzVNY1OiBt4HUNC9fGKY9kE0LYJtu6iHHfT06 IaEnpWj7IF8AuFdJXKE9w9CycmzaVDkErsRfkOAvD+jH/8TlxnqvMw2bN2kqVUS/Dunj v1WqoYqydE+XQvR6NqrMswkl6ozB6Ox2Ml7oHOH1b/XmUNrlHvalvIY1l7/V3SnQGBV3 zp7hued6bTyyKCGMf9Exdxfz7juDnpHR8i+A6FIZyVneUzyC8RLJxYhoy6LyiiFSNF8X DRuQ== X-Gm-Message-State: ABy/qLa6QPrvzJ5FFt6QOaGRHzDqP5id1AqRBtKIapbivfgLUR6JYLAU CQgDMI89F0kq27WvCB6yU6/XJkn6XzfJDrzC0BNSYPdQNt1oClrdwRDqxv+XWK2AWraGHfiUWgf c3VJs0NR1ewnUTOGq45O8turBbasxuX0aw1+mGl2/JsDcsUdoOQ== X-Received: by 2002:a17:906:8a:b0:993:f4cd:34b3 with SMTP id 10-20020a170906008a00b00993f4cd34b3mr5784279ejc.43.1688993775788; Mon, 10 Jul 2023 05:56:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlFvxHICLFQUoQg16eVXP7T0PMORG5KlPra1z3jK0WnX7MYKvQk+jZzMKAa7+Hb/vPKz4xnBiQ== X-Received: by 2002:a17:906:8a:b0:993:f4cd:34b3 with SMTP id 10-20020a170906008a00b00993f4cd34b3mr5784264ejc.43.1688993775462; Mon, 10 Jul 2023 05:56:15 -0700 (PDT) Received: from t14s.. ([212.251.14.163]) by smtp.gmail.com with ESMTPSA id m4-20020a170906258400b00992025654c4sm6133605ejb.182.2023.07.10.05.56.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 05:56:15 -0700 (PDT) From: Ioanna Alifieraki To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 1/7] arm64: mm: use IS_ENABLED(CONFIG_KEXEC_CORE) instead of #ifdef Date: Mon, 10 Jul 2023 15:56:06 +0300 Message-Id: <20230710125612.37735-2-ioanna-maria.alifieraki@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230710125612.37735-1-ioanna-maria.alifieraki@canonical.com> References: <20230710125612.37735-1-ioanna-maria.alifieraki@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jisheng Zhang BugLink: https://bugs.launchpad.net/bugs/2024479 Replace the conditional compilation using "#ifdef CONFIG_KEXEC_CORE" by a check for "IS_ENABLED(CONFIG_KEXEC_CORE)", to simplify the code and increase compile coverage. Link: https://lkml.kernel.org/r/20211206160514.2000-5-jszhang@kernel.org Signed-off-by: Jisheng Zhang Acked-by: Catalin Marinas Acked-by: Baoquan He Cc: Albert Ou Cc: Alexandre Ghiti Cc: Borislav Petkov Cc: Dave Hansen Cc: Eric W. Biederman Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Palmer Dabbelt Cc: Palmer Dabbelt Cc: Paul Walmsley Cc: Russell King Cc: Russell King (Oracle) Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit d339f1584f0acf32b32326627fa3b48e6e65c599) Signed-off-by: Ioanna Alifieraki --- arch/arm64/mm/init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 3b269c756798..8c3ffcfc3b58 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -90,7 +90,6 @@ phys_addr_t __ro_after_init arm64_dma_phys_limit; phys_addr_t __ro_after_init arm64_dma_phys_limit = PHYS_MASK + 1; #endif -#ifdef CONFIG_KEXEC_CORE /* * reserve_crashkernel() - reserves memory for crash kernel * @@ -104,6 +103,9 @@ static void __init reserve_crashkernel(void) unsigned long long crash_max = arm64_dma_phys_limit; int ret; + if (!IS_ENABLED(CONFIG_KEXEC_CORE)) + return; + ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base); /* no crashkernel= or invalid value specified */ @@ -136,11 +138,6 @@ static void __init reserve_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; } -#else -static void __init reserve_crashkernel(void) -{ -} -#endif /* CONFIG_KEXEC_CORE */ /* * Return the maximum physical address for a zone accessible by the given bits