From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 777EB26E6E8 for ; Sun, 14 Sep 2025 03:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822304; cv=none; b=Pk/TIP/Rpd1HNRA6CbmWmqIHQ+jttw5BBHSQtCLhjFT+b3MmakD+XGClXqh9V+YMZodJohpDeFKMmH+Ku+K6DvGKMhqxsB9+emX2vu+0+2ABQiw9fHejVZWy2ANNqoF9tl/7JW+gsKNBPoc9eMWzgBYzYXd1bVjGXf7IDK+pTK0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822304; c=relaxed/simple; bh=FYF9OqnW1oqjULxwM3aAWnQiXFUGSps55/Nt+hFxJ0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=buSaQJ/fdEg+S8r/1ANYGwvMdn5vShJa3scbgi1fPC9U8P/xRi7G9CxOVy7TR6SsGZsdtFfIc0x8Nl5wR2fu+4BuA/Amh87dKLAHIQlTutJqB8+wOLAEKiezYO6w8Fb2K3hLlCoRaWmVztZhke7I5U38ogNi6OoItBlySEca6+E= 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=c/oQyEMs; arc=none smtp.client-ip=209.85.208.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="c/oQyEMs" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-6228de280ccso6257088a12.3 for ; Sat, 13 Sep 2025 20:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822300; x=1758427100; 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=6PVDclpYQ6Nji01yBeit38rRV0WhZ/F6Ahkj7S8LBJ4=; b=c/oQyEMsxO7MkMZOEln/WrmMMtQQaHGOaUmTlhzl8UKvpViP19zX+vSpeUbIp0zoqN EWelczGv47S6YykHlfkwVCxMPzDowp44X5bNmchBymdwK4tYbZ18wMZwJjkP7SOQE8pm BmlFPLyEun1RebxQEt+pdvgKODvYjB1vS5rak9WegcmWyRyOOiWNwf7KpFpECZTJhJv0 2XekMJhx1WUpdbcUCPBo9hPMQ/6AXCgHyHrqkCD9fggpms2GkKKpvSlKZdyAu0Id1fIF Xlw8OZAZwLDm5B89DemFU0yVq1R7rHOG8Uw4nxvqTEy4Id0QBzTVpa6Q5BmR6v6/1tPT xdwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822300; x=1758427100; 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=6PVDclpYQ6Nji01yBeit38rRV0WhZ/F6Ahkj7S8LBJ4=; b=R616AXYqddGScVu+uBl/h/3oNld59YqcFN66YNR7hCjENJfgygLxe9h03uhjG9ytjO ARaozEn9jYrahn9ikRGZb5b0xWgWr7h6OiWhhi/tggKBJi9bfi5WDXzbyrL+ID6TLYLY Osw2jcGroyVk4i77tJwqz/1da37YwRrAhIdB+3N4f4ie/uzEaLsfHLgxkAyGmyOgI38x qnIQ6HbLIWad+0z8Ctek3K6UAH49T9wSxNxEMbW65rBVAk7Fg2LSt/kOfrEJ/5nl6EKd wO7PttFpBCZPPZfkAu8GGrwhICOOPQzpA7I/u0s8Fwqohu1raI9oTbw2gCkW3rjWC8WG gJOg== X-Forwarded-Encrypted: i=1; AJvYcCX82sgn+ugOdlEFioP1UzodVV66T/4EBGUhBcwD3OHrHZtaEYW80TGKM6+l9Ha5EN+aF+5iTfoLxuQ6@vger.kernel.org X-Gm-Message-State: AOJu0YzGwtOTtTSKWbLyJwlTFPz2JzK5nPiXFpiKPSELxGAV8FfAyxDh xNZSd1kCSp87g8H97J6wB7c7lj8w0FYJPSypsQtghkVEt33xXKKFCnCF X-Gm-Gg: ASbGncubg45JPOeKygRK6h5gMvC1+4yB4/4P4tHHatCemxIaqywwXA21jO+dAC5DWQA uAueVy7m1Z7gfEy7UWBeiDkD+SgCLtvb26bRffb2GdP7D4KuSnHDlVjGtzGnN7IEHtYMyRzvpAd A8VeWv6tSF/IduEn3DvrlK9h+nwaiXjpjgefJoDwUwfX/kz4wBDK5efzISjKRHkmJJ4yk1HFxs6 Zwtpu4yhQ/9PIbdkZilgMa6oA7H6WqHK7xp2sANa+0WoWvDOxvFsixYXr1FE+zbyTZ4QYARXgmN VKM9AVWMZUAx3C7nBZXsrejmjJk6G6OVPTUhvGU8/aeIC/D76tEN95yxBiQnq85XyS11Jc+M9X/ zts6JFfSrpL7RsrJtAFw= X-Google-Smtp-Source: AGHT+IEs7a72WksMtWatD4lSFnDxnNg7+5MS1D9GOkH6MKg4k8K6DTsXjCx54xq6hKPtDzIS4c8/bw== X-Received: by 2002:a05:6402:42d2:b0:627:f47c:b199 with SMTP id 4fb4d7f45d1cf-62ed82599f7mr8759493a12.8.1757822299751; Sat, 13 Sep 2025 20:58:19 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62edb7d9cbbsm4735738a12.15.2025.09.13.20.58.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 20:58:18 -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 51/62] init: rename get_boot_config_from_initrd to get_boot_config_from_initramfs Date: Sun, 14 Sep 2025 06:58:14 +0300 Message-ID: <20250914035814.3752803-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-ext4@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/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init/main.c b/init/main.c index a42f1f0fce84..c535e0613df8 100644 --- a/init/main.c +++ b/init/main.c @@ -264,7 +264,7 @@ static int __init loglevel(char *str) early_param("loglevel", loglevel); #ifdef CONFIG_BLK_DEV_INITRD -static void * __init get_boot_config_from_initrd(size_t *_size) +static void * __init get_boot_config_from_initramfs(size_t *_size) { u32 size, csum; char *data; @@ -311,7 +311,7 @@ static void * __init get_boot_config_from_initrd(size_t *_size) return data; } #else -static void * __init get_boot_config_from_initrd(size_t *_size) +static void * __init get_boot_config_from_initramfs(size_t *_size) { return NULL; } @@ -420,7 +420,7 @@ static void __init setup_boot_config(void) char *err; /* Cut out the bootconfig data even if we have no bootconfig option */ - data = get_boot_config_from_initrd(&size); + data = get_boot_config_from_initramfs(&size); /* If there is no bootconfig in initrd, try embedded one. */ if (!data) data = xbc_get_embedded_bootconfig(&size); @@ -479,7 +479,7 @@ static void __init exit_boot_config(void) static void __init setup_boot_config(void) { /* Remove bootconfig data from initrd */ - get_boot_config_from_initrd(NULL); + get_boot_config_from_initramfs(NULL); } static int __init warn_bootconfig(char *str) -- 2.47.2