From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 2EB7D18E377 for ; Sat, 13 Sep 2025 01:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726044; cv=none; b=ANPG2rzwy3zzt5HpcokXR1lKFwATXu1i+RD7o3dlmAZpyPHW4BO866m0/1puI8M4fQ/YLS6B/5r/Vd1ATOyXmqUTucv26DcKlUKCtkOLTYRwLf6X3waxJOZvR25j/APSarYW+pcTg0YXWVWaKzcytxA4HPhll/HdaJPEGFqi9Lw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757726044; c=relaxed/simple; bh=62K0YkfDdlhI1a+nelUifSqHM+TzXEz2TygIEqrA7f8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UYR4oqgDUPQGN6csZ9YXhj1/oKgN9jeUyaOIz7Qk7q+Wxshu+OQQairCPKtcvKVZveRSz7rDAYToTb9uQ1x9PG7IALvPNhSAzzQJHRL0/3A/vYUthCRGaBO3HCMjdZyDt+TGWmO2XyqRoO54UpvFQJemWGFFy5RNXLaFUAscVSc= 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=mgL7/8Ot; arc=none smtp.client-ip=209.85.218.46 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="mgL7/8Ot" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-b07e3a77b72so31721566b.0 for ; Fri, 12 Sep 2025 18:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757726040; x=1758330840; 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=XKplWAnltyYUA7miE90Ca2CY8VaXOWztn2OaioKTh7Y=; b=mgL7/8Ot4tslwTLXLJnn8ZN1WtZ81gcffeEwJlFjWvuiAaeXt6TWrC8zXcznklloFx uE04x/bEwXwHTi33IoBatcHEkHmwD2lXwHM76H6eu2Xh1l/x1EAVoEO+8JX5l8MhNv8n USYETvfIejgX9IzNh2ST92so6AfJ4/BdCUptwe/i+bEZj7a9xh27o675U/tYo/otEsXL CUlyxdSb4RYP4422AH59ACMRmaf7Q7JLQKbkjiHhmQuhOVaEFCF9Vacgpi9YIR3H4I+q 0oqgWtIpnPKmzuO6LN9UOHdI/2W8w5t3SwQiUEMa6lMs9rFfyZYLLNvOGvjrZDDyCXC8 i1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757726040; x=1758330840; 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=XKplWAnltyYUA7miE90Ca2CY8VaXOWztn2OaioKTh7Y=; b=Kh7v+1a1EkcyfV/H5qeYacIhAJmdupK3SNp7zHJ2kAi3gWX5lskzOumb4tFIotaRad 5fJWyasYjIPwtGbjzbngzrFW+Ide2kTeyxqn/AnxrLUY/3SkPBKWz+tGWABsv+4t9OQF Tl9slqpSWE5uwVc1iVWJTKqLbAGWnBGJTXGVH200gZvb5ouYiFHEvxNayDQXC/RROFaZ iUvNh7qWUlzAUwstSURROVROcFq5VvDIHO1WQvHoxHst6FwulYic3ANbM1FeT/XsaNJ3 iadS+iPGQn2zXHL+yQMRTs2t5zGUJwOwkRC8P6t4BkcXyaPd4mI0rfs0IWJTAu4T9VNG rp6w== X-Forwarded-Encrypted: i=1; AJvYcCWKdNiGB67+EI9UcA9s8Ihcim7VFqf2c8aKRCrjrjs4wcj9RJrUqADs164WxqABNCknSzQrZI51cxW3@vger.kernel.org X-Gm-Message-State: AOJu0Yy03uGo1+R/1//JoYRTby42jjJh2YP015WoWha2EVNrqTRgqW7V EaFz0fe4vCfbkL2XjT2J9hYqUTKsC35y4lpFR9TEJXyrko7ioO1FwRER X-Gm-Gg: ASbGncsFx1tGj+gcwr4JQxpS51YIPQ+TxiEpIgSewsPhcMd571kRWCG3dOnO486vHfk ZbB9sei4kUQxOxzYklbPdiWMg7o090sGinvNGGrUm2UDjhYjhhleqv/BOk6lHXmrmKNl66IVYiw RSoCqgyK2QEM7fxUml6QLeJWQUP03E0Tb9WOtMavGwhQEJm3yDRWqvPEA/cg+ic2aQ6JORDXtVq tU5VlM5GAX8rxrZOqn+LETlmv0uE+RBqiagIBO4cozq/ZjZniJGwE7JiFhZsNOtuB7jfceRp2WJ GbcaB0BzdFwk+WSRYINEP59PBIDPg9Qn/m45leB8OscYJNwz2nSYt70G/9pFNvy42+7siFPejzW pmV129NRD9QX6BkT55xI= X-Google-Smtp-Source: AGHT+IEnK8aPf5G48k9Kvznzx9z/ncVW6jv1PE49Xay12m4larnapJ0sjzKIoAPfuRHHNKc71/ZXZg== X-Received: by 2002:a17:907:86a7:b0:afe:8420:1152 with SMTP id a640c23a62f3a-b07a6490897mr877727966b.18.1757726040472; Fri, 12 Sep 2025 18:14:00 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b3128a1esm461508066b.29.2025.09.12.18.13.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:13:59 -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 31/62] init: rename initrd_below_start_ok to initramfs_below_start_ok Date: Sat, 13 Sep 2025 00:38:10 +0000 Message-ID: <20250913003842.41944-32-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-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit It refers to initramfs, not to initrd Signed-off-by: Askar Safin --- arch/csky/kernel/setup.c | 2 +- arch/mips/kernel/setup.c | 2 +- arch/openrisc/kernel/setup.c | 2 +- arch/parisc/mm/init.c | 2 +- arch/xtensa/kernel/setup.c | 4 ++-- drivers/of/fdt.c | 2 +- include/linux/initrd.h | 2 +- init/do_mounts_initrd.c | 2 +- init/initramfs.c | 2 +- init/main.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index ce128888462e..403a977b8c1f 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -40,7 +40,7 @@ static void __init setup_initrd(void) pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n", (void *)(virt_external_initramfs_start), size); - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; return; diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index da11ae875539..aed454ebd751 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -225,7 +225,7 @@ static void __init finalize_initrd(void) maybe_bswap_initrd(); memblock_reserve(__pa(virt_external_initramfs_start), size); - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", virt_external_initramfs_start, size); diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index f387dc57ec35..337a0381c452 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -246,7 +246,7 @@ void __init setup_arch(char **cmdline_p) } else { printk(KERN_INFO "Initial ramdisk at: 0x%p (%lu bytes)\n", (void *)(virt_external_initramfs_start), virt_external_initramfs_end - virt_external_initramfs_start); - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; } #endif diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 74bfe9797589..af7a33c8bd31 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -308,7 +308,7 @@ static void __init setup_bootmem(void) } else { initrd_reserve = virt_external_initramfs_end - virt_external_initramfs_start; } - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __pa(virt_external_initramfs_start), __pa(virt_external_initramfs_start) + initrd_reserve, mem_max); memblock_reserve(__pa(virt_external_initramfs_start), initrd_reserve); diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 2e9003be3e8c..b86367178bce 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -51,7 +51,7 @@ #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long virt_external_initramfs_start; extern unsigned long virt_external_initramfs_end; -extern int initrd_below_start_ok; +extern int initramfs_below_start_ok; #endif #ifdef CONFIG_USE_OF @@ -292,7 +292,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_BLK_DEV_INITRD if (virt_external_initramfs_start < virt_external_initramfs_end && !mem_reserve(__pa(virt_external_initramfs_start), __pa(virt_external_initramfs_end))) - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; else virt_external_initramfs_start = 0; #endif diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index baf8347e0314..127b37f211cb 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -767,7 +767,7 @@ static void __early_init_dt_declare_initrd(unsigned long start, !(IS_ENABLED(CONFIG_RISCV) && IS_ENABLED(CONFIG_64BIT))) { virt_external_initramfs_start = (unsigned long)__va(start); virt_external_initramfs_end = (unsigned long)__va(end); - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; } } diff --git a/include/linux/initrd.h b/include/linux/initrd.h index f19efebe8221..364b603215ac 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -4,7 +4,7 @@ #define __LINUX_INITRD_H /* 1 if it is not an error if virt_external_initramfs_start < memory_start */ -extern int initrd_below_start_ok; +extern int initramfs_below_start_ok; extern unsigned long virt_external_initramfs_start, virt_external_initramfs_end; extern void free_initrd_mem(unsigned long, unsigned long); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 535ce459ab94..d8b809ced11b 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -12,7 +12,7 @@ #include "do_mounts.h" -int initrd_below_start_ok; +int initramfs_below_start_ok; static int __init early_initrdmem(char *p) { diff --git a/init/initramfs.c b/init/initramfs.c index d2301cc6c470..a9c5d211665d 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -643,7 +643,7 @@ void __init reserve_initrd_mem(void) /* Now convert initrd to virtual addresses */ virt_external_initramfs_start = (unsigned long)__va(phys_external_initramfs_start); virt_external_initramfs_end = virt_external_initramfs_start + phys_external_initramfs_size; - initrd_below_start_ok = 1; + initramfs_below_start_ok = 1; return; disable: diff --git a/init/main.c b/init/main.c index 5f4d860ab72a..58a7199c81f7 100644 --- a/init/main.c +++ b/init/main.c @@ -1047,7 +1047,7 @@ void start_kernel(void) locking_selftest(); #ifdef CONFIG_BLK_DEV_INITRD - if (virt_external_initramfs_start && !initrd_below_start_ok && + if (virt_external_initramfs_start && !initramfs_below_start_ok && page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)) < min_low_pfn) { pr_crit("initrd overwritten (0x%08lx < 0x%08lx) - disabling it.\n", page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)), -- 2.47.2