From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51D31CAC582 for ; Sat, 13 Sep 2025 01:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oZvVVTQhJiPShKa1dXFvOKi8GotNdohuOM7hG5x8yGI=; b=WwBViROFsaUCoe PB87IzyHZIKJtEvPeqa8nE1QX8SejSvaMWL8lC/1wTUCeEMVrIfddzsf2Uk/LlBKjXmPiWe6lrxNB QWI11IuH6iSzHZwDKPmjO+9P0v9M4SIUlP6mTykNrZLR7ggJ1StUxDiLcNyeQ0UKS+9yIFaUm+bkB 14+EzjMm62+TShMcG/UsC4EGB682kU1ImhzChWHqK3flczkpqbxv2GG9V9iPFynhY6WJi4vuijG6Z ErzesgZ8f8ZrnX3y8i66fmVlWrGszLuqDWc78EhxsXdk1sRw7uF4ongEGaSbckAf6vLqS2ABeo6wF bxT1weFZ71z4LzMpNuRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxEsC-0000000CZUw-48OI; Sat, 13 Sep 2025 01:16:16 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxEs9-0000000CZTC-3xPo for linux-riscv@lists.infradead.org; Sat, 13 Sep 2025 01:16:15 +0000 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-61cd6089262so3763354a12.3 for ; Fri, 12 Sep 2025 18:16:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726172; x=1758330972; darn=lists.infradead.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=IjswgxWrFNOKRwzjkiuQ0bl5mmgWmo9Cqzfehf6N75I=; b=LGujDUzRiHXVs4bwv7TAJAJ+Q6DQlIbrkOJ0bBHN7LRwAntWTSLt22F9ChFPTCNt4Y K9RpYdTD5aqsiYOciX6QIOqa05yIXLcVAiYGc0Tk3AYLodZNCG1xSVYZmRiquqAwTboO K2I0llMne/DPSvTiqZ7+JvRAuKopsl3eyNc9W+N55rxGM6iX3cup6X2DzPay57ixoTgx GslS5aW1csH5GblGRqNodJjDccJ19nR/RtXX0upLZZScs+WfvraWKylPA/c5Q7GTJY2X sYbK0WL5DL9UWUEopvk4ACRkYpXQ6lt8bHuDwx2Nl5oYfnhoMivVszLCYDOcDV+sK2ZZ LD2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726172; x=1758330972; 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=IjswgxWrFNOKRwzjkiuQ0bl5mmgWmo9Cqzfehf6N75I=; b=qPLMKDCSSntXP9GXqgpZapTAYm23yfJuSZiP/SXsN2Da0G83JDtmD9+OuSvIZLGS+6 9pR3/SFEgleMHw5S69IvNM85XTbkZUP44SbBoahvGhG7Lexk0av0JlrfRN0Q3qGzfsVA 9JnZrWm/1XnP5bT6ZVEE5NXGKj7BKydW15t+DQSOGM7rwyKaSyPsL6x+JesCm2ksRIzI GcRVN6IBJdEYNJv2xTROY8sLZzlfX1LBYfJ0SuD5fbPef9aoPapIGfzwdH14vIB5JyaF HQ3g8Wsw2961qPwRUzz/QyadsDR/B/v1XQgdb6rY99YcIETgLHgyWGa3H9rq+3I2lH7n Ic5Q== X-Forwarded-Encrypted: i=1; AJvYcCVMvszKTb4k+NFlwBeDrokVntfcHfzperwiJ5z+i9Y8C4EnCsEx5RfkdKjRT1o4dJmQLlHyWT3oqLyoiA==@lists.infradead.org X-Gm-Message-State: AOJu0YyS6kjoZzOVtYpucmloMUoXD+u6F6X2kKJjG34xWXH5YNSpN0Ai 9VegQ4cRHWBoFryJ10B0Mf4990FSQ8oT+7FwKM1wbwiL98OpzQUdvgVD X-Gm-Gg: ASbGnctYNpmU1haimAYjOmryBS0t+yabEv/iyaoQusDrZiPjej5oauQ3Jj9saXhlur5 18flWmqKmH5qLWbDjXh8zP30uWkE+5qmVdGUvyG8VOfw90qHg2bser/Is8TgzOhUeXBz1Ag+GXm 0SIWlkkrZMmvOIm0FtQo8rtIH6Zib0MhHHsZgDHAWlF46gQO+6QSv3Y+XbkTiwy+QUDPNj90ofh 3cm7qfqZ999PJFv1L8xdTDsJXl4TLg7ZcWpdUpbKNkJBKmTFYTvyvzrKvioRBE6l/NAydsLGX5q Q9DXjYt06ogZ5Ta64rSQ7b6hdNMHwYSe362yfKDWQg3pVuLjVpDtXCNVQg8d46iT746Lav+h/lY C3l5BqQ5t1wRS8BO+aMpJhrfu2ut4aA== X-Google-Smtp-Source: AGHT+IE1vl5AoL08hnxvihV4MKDaztrK6JygVC9P3kqlNeKyWBvnhpYqmVFYWjhHgbqbRt0/sx/2Sg== X-Received: by 2002:a05:6402:40d3:b0:61e:ae59:5f07 with SMTP id 4fb4d7f45d1cf-62ed82718ddmr4360854a12.20.1757726172015; Fri, 12 Sep 2025 18:16:12 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id 4fb4d7f45d1cf-62ec33ac2efsm4135647a12.12.2025.09.12.18.16.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:16:10 -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 33/62] init: remove init/do_mounts_initrd.c Date: Sat, 13 Sep 2025 00:38:12 +0000 Message-ID: <20250913003842.41944-34-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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250912_181614_004840_E7A1A655 X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This is cleanup after initrd removal Signed-off-by: Askar Safin --- init/Makefile | 1 - init/do_mounts_initrd.c | 36 ------------------------------------ init/initramfs.c | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 init/do_mounts_initrd.c diff --git a/init/Makefile b/init/Makefile index b020154b3d2a..09657c0274eb 100644 --- a/init/Makefile +++ b/init/Makefile @@ -17,7 +17,6 @@ obj-$(CONFIG_INITRAMFS_TEST) += initramfs_test.o obj-y += init_task.o mounts-y := do_mounts.o -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o # # UTS_VERSION diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c deleted file mode 100644 index 509f912c0fce..000000000000 --- a/init/do_mounts_initrd.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "do_mounts.h" - -static int __init early_initrdmem(char *p) -{ - phys_addr_t start; - unsigned long size; - char *endp; - - start = memparse(p, &endp); - if (*endp == ',') { - size = memparse(endp + 1, NULL); - - phys_external_initramfs_start = start; - phys_external_initramfs_size = size; - } - return 0; -} -early_param("initrdmem", early_initrdmem); - -static int __init early_initrd(char *p) -{ - return early_initrdmem(p); -} -early_param("initrd", early_initrd); diff --git a/init/initramfs.c b/init/initramfs.c index 90096177a867..8ed352721a79 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -606,6 +606,29 @@ int initramfs_below_start_ok; phys_addr_t phys_external_initramfs_start __initdata; unsigned long phys_external_initramfs_size __initdata; +static int __init early_initrdmem(char *p) +{ + phys_addr_t start; + unsigned long size; + char *endp; + + start = memparse(p, &endp); + if (*endp == ',') { + size = memparse(endp + 1, NULL); + + phys_external_initramfs_start = start; + phys_external_initramfs_size = size; + } + return 0; +} +early_param("initrdmem", early_initrdmem); + +static int __init early_initrd(char *p) +{ + return early_initrdmem(p); +} +early_param("initrd", early_initrd); + static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); void __init reserve_initrd_mem(void) -- 2.47.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv