From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A89263F32 for ; Sun, 14 Sep 2025 03:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822340; cv=none; b=uWqL7qzEdUSiCr7QSO8NDSl5XLJFfapu3DazB9CpcZtCKRsQ2o++Bz9FQ8PkBm9gZWRsPi3rqSznEEkidzh6exY+mMaW/2lPmbr+tkOldu+3Zx2Co6KjdGgaXJYSYwJjxME9YMFAXhYGw7RQrjpVi5WkYXC2Hv1Y8ZIP1naCqX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822340; c=relaxed/simple; bh=wnloEZCAdLMdrfx5MH3Z2R6wkZPYS7ZaUTzWldA8TL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CSp8c4AJ9WpkN2rMuo9Q28fSV6bwXDJHPf+0FtoOAHZAxip9UCU48REkvTiH2tFZtc5iSmeG/XlwrIZ3+dwMEHksdHS89J2hXbDmKTnLeG7Ilqvf5TDd+clz3BHzbTqKIc1wm/bXN0GcKRP/zW9utO7+VFV9IEL1T1cr8WqFgjg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=X5pg8XJn; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X5pg8XJn" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b0418f6fc27so537242466b.3 for ; Sat, 13 Sep 2025 20:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822336; x=1758427136; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8LDuJwsx1JnhEieEawhozXv7eEPm7AwX4v3UgIhLgCc=; b=X5pg8XJn16li9nWBcEbx3x1guhEtT7Dd40HZ4Qzs/URlek7w4R7LXZmrzfItUvNPsj hhIFE1jSywXm5WVgAprCDNMLupH2ctNl2lJAMNYy4iyGfrljLsrD6PgmEBJNWfZRPCkz EWfFGVb7ZoErrmRwtTtqjdHyrri+IaBznTfZHczIUVaM0XTwvykHg/vAB/SFXXGPEk3H X4X8LT8iuXIBPc4Qu2mcOwFlknqC0YSGe0MXHWTSrdHpeheK1A6lFH2vmXoU5nvdLhjn 18bODQKz4DDOwrCzdiA58D+CmSEddDkqzbU0FA4VxgbXZ539oukEXtUJhakHaKjaWIsJ 1qPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822336; x=1758427136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8LDuJwsx1JnhEieEawhozXv7eEPm7AwX4v3UgIhLgCc=; b=lj367wom5Ll5EU1aUDJ9C0E6IFYZZxABJsXI0OmQCzTxTY4J96CttQn12htBzbmQG7 dkuofi2xFFRfBwI/FGRmKwzyNP54wYoGKWEZeQJrfg941Ytb2yZoG16tbpm0XSBCUOFq KOaJFHSiKnl3b+rtXZMsUQCcUuWAxjxj18p3LvOxCyztvWvNkrRVcsljrenJ/rPXkPtX dhXOpf/6D28WUaE3r1QO/01bD+tHIxVn5yphM1GL9SIHdZ3cH7AFIQeO5VD70gMsKk6W gBR8x4J6xq1X481fUqz5eRJf9B0DgkcWcRpEkCyVN/LF0/m8ZohLZU6SBkWn8Dy2Jtwf cLUA== X-Forwarded-Encrypted: i=1; AJvYcCVI/Eoim/16RICAW5wyCzRFnxAd+GQOrZVT1cYDZcfkiHr0gykAjb2lDcr4ZeAWzIr+qDpyW/9fYYXB@vger.kernel.org X-Gm-Message-State: AOJu0YwOgt0FPWwNFxzDG/BSya1G43F5NkQSjyyB7KYnn8bHCtOZ1YEq vjj7Tm4V3gAvBC1UNkFHB2gDf7z9P3FfY79R9gsfjTXFD6Ka8BFtY3CM X-Gm-Gg: ASbGnctubevO2qEbX+muqT4LIDxscVNsdArfzAI+T8N2p5sYjGLi+eXWichtI6MJHBd RgT4cMLpREteB7oDKjbHYtaHgFFqd8grCEC8agHDV0raVJpUV64PJmqy2omlsIGa1s8+Sk2pz7q R1ahbKrZT06McJcvDqW9sqNhfKwJgQ5pffLQnB6QY3PD0RBh5bEQ4GCLjpqoie0TgHKUluwjlOS 2NyAv7Ph0lhIxEuPpjyU99Jd9NvQLasg36g7bujVo1XfOkv+5qOfV/Do0S+RxstYpawmvaJoDVP 84+db+0uTKabK8UYFRdsl9i1iST/jzOxnMJtYDP9h7SU3PiXKk6PYBDgfaYWOMpGHXdqbXoDWN0 izZhSCuvJBN0oEApDMHalhQlw0qw5rg== X-Google-Smtp-Source: AGHT+IHNLaKXJiC+zXQ2uAPY4azg+7W3/1g8JczFufMn8mQqgVOZ73ifHuYY/OKrygFTvfUSeCcOcw== X-Received: by 2002:a17:907:3e90:b0:afe:cbee:7660 with SMTP id a640c23a62f3a-b07c34d63c8mr797483566b.21.1757822335865; Sat, 13 Sep 2025 20:58:55 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b0cf2112639sm91581266b.104.2025.09.13.20.58.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:58:55 -0700 (PDT) From: Askar Safin To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Christian Brauner , Al Viro , Jan Kara , Christoph Hellwig , Jens Axboe , Andy Shevchenko , Aleksa Sarai , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Julian Stecklina , Gao Xiang , Art Nikpal , Andrew Morton , Eric Curtin , Alexander Graf , Rob Landley , Lennart Poettering , linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, x86@kernel.org, Ingo Molnar , linux-block@vger.kernel.org, initramfs@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-ext4@vger.kernel.org, "Theodore Y . Ts'o" , linux-acpi@vger.kernel.org, Michal Simek , devicetree@vger.kernel.org, Luis Chamberlain , Kees Cook , Thorsten Blum , Heiko Carstens , patches@lists.linux.dev Subject: [PATCH RESEND 52/62] init: rename do_retain_initrd to retain_initramfs Date: Sun, 14 Sep 2025 06:58:50 +0300 Message-ID: <20250914035850.3762697-1-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com> References: <20250913003842.41944-1-safinaskar@gmail.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/initramfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 30e94ebf4902..40c8e4b05886 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -570,13 +570,13 @@ char * __init unpack_to_rootfs(char *buf, unsigned long len) return message; } -static int __initdata do_retain_initrd; +static int __initdata retain_initramfs; static int __init retain_initrd_param(char *str) { if (*str) return 0; - do_retain_initrd = 1; + retain_initramfs = 1; return 1; } __setup("retain_initrd", retain_initrd_param); @@ -584,7 +584,7 @@ __setup("retain_initrd", retain_initrd_param); #ifdef CONFIG_ARCH_HAS_KEEPINITRD static int __init keepinitrd_setup(char *__unused) { - do_retain_initrd = 1; + retain_initramfs = 1; return 1; } __setup("keepinitrd", keepinitrd_setup); @@ -743,9 +743,9 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) * If the initrd region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ - if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_initrd()) { + if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initrd()) { free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end); - } else if (do_retain_initrd && virt_external_initramfs_start) { + } else if (retain_initramfs && virt_external_initramfs_start) { bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start; bin_attr_initrd.private = (void *)virt_external_initramfs_start; if (sysfs_create_bin_file(firmware_kobj, &bin_attr_initrd)) -- 2.47.2