From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 2FBCB26B2A5 for ; Sun, 14 Sep 2025 03:59:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822377; cv=none; b=pi7oQTMVosvpziX+cScsIs5VgZNH5IQ/HYy8QM0zWcRbrUlcbSjn7FtK82S7kOlB9XaqRQ/8uuKWFede5De708647YvR2qudStMn3pSeekWjeaEpwCuaSfBURXhl/h9JyL30AGFaNAFCs2PYiw+R4R9JsbNYAyg23ilW549JbrE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822377; c=relaxed/simple; bh=dWOevKs33KVPp7BfwW01lTdoAaIwqA9A0zVQ5+zAb7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZlsKzOMZ78Jzvj/PmR01Oo3P5hAqqNjpdarOInRsdozRSBdqHo65/Vbkie1JxrGlbTPkkGOE1Fbc7xw3xUREqjJiYkfhtWwXD2iiW6Azr2//RItbshOoOtRAqNSYFIEbJiIqbs5D54NUAgTfkJ6RXlkSj9uAdxDKKGcY8EOzDSc= 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=Q8xrbsbQ; arc=none smtp.client-ip=209.85.218.52 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="Q8xrbsbQ" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-afcb78ead12so403703866b.1 for ; Sat, 13 Sep 2025 20:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822372; x=1758427172; darn=lists.linux-m68k.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=O9abWz0+AALTE1DyE86pUo1tihrL6Hn8wt7mMTmG960=; b=Q8xrbsbQLHBfw6zqG7qFIrEylz4f7Q97k8/6HyR8lCdRLepmZsBt4xzutU9sIv0dB3 YpZ13y8aDMpLVtQpLV+0p2VBs6vwZOOjb7gyf5PcXojtSbV120srQfewQaW+i9u7hIZ/ ZAa7cnWnHSR1tIypm3ZDyv1+vTmey39VnWlZ+/ABoLis95OYR/ye0pjns2g5DkRUP+ci pg468xqet9lUNyPUgMDVXnvVhUw6VD1iRTNP42A4AFKzA8Ic/g738lKL7k9ApuT1miv5 +nuC/KCK1xUTsvVyimotSwfdycjvA/cLt244p6nhE6HY6ZpmnryG4EzPI0JxbGUaitYY BKmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822372; x=1758427172; 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=O9abWz0+AALTE1DyE86pUo1tihrL6Hn8wt7mMTmG960=; b=N66dGnrPDcDGfqurpwXcThFZG1EQHbDzj0+cSMKQ+f/kSkCZLFxkTLcPGbXo4QOIUn lmp4uRRFGHewYqLbcr3nVf/S80qERqIf9CTczSdTfa4uVwUnXSRXtChLzf1rFhjtWcNC nN7vJinpNY9siwmHPR+MBfwxwuBlAiQu+vqZrkf9k+apOZf4LRMwUxSEQsXrqC9oPw/E jjXvdF0IrbVKPHTpFZCoE8rvG2KWGuZhcfRNs2CGeQ93Bw9yARyDlaql5irpwVxPqv9C XC+Z6wytWXrdHI1L8JSDwZWzsWfyihOVN/gZNX8EQhXyqX9cJIL2xsgYjvIQu39MyCA1 6s2g== X-Forwarded-Encrypted: i=1; AJvYcCXS+IkKG6T4e83UYh5lCQ5UyhnmmDa92GYM/LhLiH7JGj0XCv+Amw4r+U0FOP8wponubZZ5PH3YT+nh@lists.linux-m68k.org X-Gm-Message-State: AOJu0YwlQq9nQ8quAhzrASGAzZcL1dlFXWXyzuqXNWOcov5F7Om4bbZ/ je6X7QbwvrOCqjqFTvMtNR/fILheIA8gzYS0ynLUd7wdzbLUYqjU0CZ1 X-Gm-Gg: ASbGncs/7EdPx0h+0IR/ukxVcQox40urU+14LrbpNpAUuHu8TBNaBIjl8M6v4TWir+7 JcpTqEAJUgVhIXsHdItLOdOVfrGDBa1NURbi1j4kRRaGAGMq+SyxugndVWXvz8TtK+0U54Ylu5q MegzJiRaM5CVu+gW1ESbTOjCt5Y7YdPI3H+64WNtJB2EhZyzvl4v7OWJAA7u14+BwODxeEf21Kb aqJ+NKDs47Vy7CTnbj6b5Xg3b2s1W5iRjqk2X0uQAcSMPuj6dc6lKhnIQ+WuQWZVM4cC3HC3Kih U98VfYU30M4/XITmpi8yb/xSVkw6vgE9bn8csQsPazI5aD5SBJB4UXwYY0nnFJW9WeKjrlT2u+K IzwpuQue0zD0LbrX+zDg= X-Google-Smtp-Source: AGHT+IHIaNmlQUOqaI2XvHaD2x2sJJCA+iwXMxeIqgPaozK4MzRrxS2gXxwIxVkINaRf0GrOSh3U1Q== X-Received: by 2002:a17:907:3ea6:b0:b09:48c6:b7ad with SMTP id a640c23a62f3a-b0948c6c6a4mr387666066b.57.1757822371514; Sat, 13 Sep 2025 20:59:31 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07de03d93csm287001766b.12.2025.09.13.20.59.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:59:31 -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 53/62] init: rename kexec_free_initrd to kexec_free_initramfs Date: Sun, 14 Sep 2025 06:59:26 +0300 Message-ID: <20250914035926.3770703-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-m68k@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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 40c8e4b05886..d52314b17c25 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -690,7 +690,7 @@ void __weak __init free_initramfs_mem(unsigned long start, unsigned long end) } #ifdef CONFIG_CRASH_RESERVE -static bool __init kexec_free_initrd(void) +static bool __init kexec_free_initramfs(void) { unsigned long crashk_start = (unsigned long)__va(crashk_res.start); unsigned long crashk_end = (unsigned long)__va(crashk_res.end); @@ -713,7 +713,7 @@ static bool __init kexec_free_initrd(void) return true; } #else -static inline bool kexec_free_initrd(void) +static inline bool kexec_free_initramfs(void) { return false; } @@ -743,7 +743,7 @@ 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 (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initrd()) { + if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initramfs()) { free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end); } else if (retain_initramfs && virt_external_initramfs_start) { bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start; -- 2.47.2