From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 1C1A215E5DC for ; Sat, 13 Sep 2025 01:05:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725516; cv=none; b=Dc8RSgjayJvFsVkfh29ZjbfQtuNwcflBjthnQ6IFXrrlMQdz6Yf8+2nwa8odtenuG4n1epqrcs/Kr6iLJU9EquEVxNpgVvL1KmZH56NIFQQzDNcZCkYEUSwiwLjvMxmhqT/GtjtY4aILXWBQbkC43/M0+OvyFiLZ7Vdt8DJ6ASA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757725516; c=relaxed/simple; bh=S+LMTI5gKh7jR4HnMBjppMSsjKCA+4Wi7QuAEkwwnu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IhBHdeATvGrpmB7WVJwo/Ay4edbM3cWNqWNGstxWtNoEzN2fpSGYexVqVRUSz3d3ZqrMIwdx4+yvWX3L+/hbuOZL7bolENVfAESj0gF5EgTXeE5LsSrmbYrjAoZYhZ5bOKJ+Q4AgZ33B8XOwKF0eTMCkwEP2vIWe4Mplso6HIkA= 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=dGD5AHaY; arc=none smtp.client-ip=209.85.208.41 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="dGD5AHaY" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-61a8c134533so4693024a12.3 for ; Fri, 12 Sep 2025 18:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757725509; x=1758330309; darn=lists.linux.dev; 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=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=dGD5AHaYAOsicv15kvR+nowgu6UPiRZkwJf+GkJGOVS083wZShtMe2zzA1GBe8ec7P IKLnzzxAlmTd+2awZ45dHejKKW4hgpTk7IHZXFcKMSSTgO5TlsOwYW+FEp7TC42JsvVd FNe5tLEvmh0gLsDekQ1y1rRhlc1R/dWeEBhU++KLQossqy48xCzIt20Rjhxuz0I99Cu5 D1YfTYmvtN6bnNnv/nDSc+gSai2DrvcA37GoNeXJvSk7pooHyvO3y8fIanqr9QiZGLQ1 1PKrqTJ09Njp3vJS8s3dBTbt3wfCOHurnRj8pRklbEnuT7YuwjbdK36s2Q0YzE2jdIQL MJfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757725509; x=1758330309; 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=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=RYOxBaVbUBUc8CVmUf/QGzntDcprF9yfTd3p8qNDOuH6kpbD+sl8tNUV5CkXw/Y8c5 0cKGLRZ3RujXzM/6KsCd5DhEC48L5d/PI2ipaUFg+H+RO0VYctvk8rQb+YrV3YqspdbT +yz1QbYzg96tPYQoXWuFLy+th2CyK2+Ynu6mYpHvphxFb4rZI4edR78fs38EIjpfnOR0 2Mi5BOX84bSin5wDV/gtsOZC5wX8zPoThhGgOiNfx5jKpp2MUL4Af1mazDd5kQqWFoNZ wLmjqp64lm5e3gGtiYM8ngcv/NOVmiuZGldbhCnTaS6UqeNJSI3wvhFkVT0m5KS9Jk/x uaBQ== X-Forwarded-Encrypted: i=1; AJvYcCVe4jDg/8MqMv2v1ucZbfJxch7I+WwFrIhBKXa21o5Sfm5XH2nWVQ5HdLvSKLYk1CQHyWTwCiYU@lists.linux.dev X-Gm-Message-State: AOJu0YxWWKw1gMeKGpLUgfXPLdC0m+0U1CDjL//PW8hrVDYxkqrBcXfK +20oWw46XL84Vv1zjAPSEnAnWtO1H7EMS1KFEeL14ti4jyTzxql+jhmw X-Gm-Gg: ASbGncuo0YzLh0n3yv40QlWVF2+0WXMlP8rlz0ZqJGAsPkAPoGPieRj3tGnYQqCXFnS dhzArRx0aghlugCVKSqjS7xzSj/MnITqST4hTbgW21xRbv1KkaRDQVvPoZfFJ72m4KaUcsWS3Jd Fm9c7lBAeY+TaLJQDld5EYmJt87/r0nzBJ/iOfqE0CsdQeTcbXHBuYbF5goYHnGUJEQMlH++x3c L/5UOtifI7HCFCJtpkm21mrEr6Dbgc6LOLKOALAIaMSmPDg2V678OIg0RO/zsZyOQvZVt+/jen0 ehll8XhH1Tv9OMgsvzIAZ5EN/65HLHfrOADKo50jFqZgqe7TOiktg5MYdqo82z75vHskZv14ytn DhS2IpngbF/5PS5zuZh8= X-Google-Smtp-Source: AGHT+IHBVL7U9njYQbYDntatJDbtYTvNiZyrYrp6F3Zot8CfKJXHpFfpfQfFxJfdQecWj/pXbevxCg== X-Received: by 2002:a17:907:980a:b0:b04:7ea3:a10c with SMTP id a640c23a62f3a-b07c3551576mr448691266b.8.1757725509440; Fri, 12 Sep 2025 18:05:09 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b31291b0sm475372166b.34.2025.09.12.18.05.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Sep 2025 18:05:08 -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 23/62] init: rename __initramfs_{start,size} to __builtin_initramfs_{start,size} Date: Sat, 13 Sep 2025 00:38:02 +0000 Message-ID: <20250913003842.41944-24-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: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rename __initramfs_start to __builtin_initramfs_start and __initramfs_size to __builtin_initramfs_size . This is more clear Signed-off-by: Askar Safin --- arch/x86/tools/relocs.c | 2 +- drivers/acpi/tables.c | 4 ++-- include/asm-generic/vmlinux.lds.h | 6 +++--- include/linux/initrd.h | 4 ++-- init/initramfs.c | 4 +--- usr/initramfs_data.S | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 5778bc498415..4b4e556f1b52 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -87,7 +87,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { "__(start|stop)_notes|" "__end_rodata|" "__end_rodata_aligned|" - "__initramfs_start|" + "__builtin_initramfs_start|" "(jiffies|jiffies_64)|" #if ELF_BITS == 64 "__end_rodata_hpage_align|" diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index fa9bb8c8ce95..3160cb7dca00 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -429,8 +429,8 @@ void __init acpi_table_upgrade(void) struct cpio_data file; if (IS_ENABLED(CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD)) { - data = __initramfs_start; - size = __initramfs_size; + data = __builtin_initramfs_start; + size = __builtin_initramfs_size; } else { data = (void *)initrd_start; size = initrd_end - initrd_start; diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ae2d2359b79e..a6bd2ff46f7e 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -46,8 +46,8 @@ * [_sdata, _edata] is the data section * * Some of the included output section have their own set of constants. - * Examples are: [__initramfs_start, __initramfs_end] for initramfs and - * [__nosave_begin, __nosave_end] for the nosave data + * Examples are: [__builtin_initramfs_start, __builtin_initramfs_start + __builtin_initramfs_size] + * for initramfs and [__nosave_begin, __nosave_end] for the nosave data */ #include @@ -969,7 +969,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) #ifdef CONFIG_BLK_DEV_INITRD #define INIT_RAM_FS \ . = ALIGN(4); \ - __initramfs_start = .; \ + __builtin_initramfs_start = .; \ KEEP(*(.init.ramfs)) \ . = ALIGN(8); \ KEEP(*(.init.ramfs.info)) diff --git a/include/linux/initrd.h b/include/linux/initrd.h index cc389ef1a738..e49c7166dbb3 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -21,8 +21,8 @@ static inline void wait_for_initramfs(void) {} extern phys_addr_t phys_initrd_start; extern unsigned long phys_initrd_size; -extern char __initramfs_start[]; -extern unsigned long __initramfs_size; +extern char __builtin_initramfs_start[]; +extern unsigned long __builtin_initramfs_size; void console_on_rootfs(void); diff --git a/init/initramfs.c b/init/initramfs.c index 850cb0de873e..2866d7a0afd7 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -597,8 +597,6 @@ static int __init initramfs_async_setup(char *str) } __setup("initramfs_async=", initramfs_async_setup); -extern char __initramfs_start[]; -extern unsigned long __initramfs_size; #include #include @@ -695,7 +693,7 @@ static inline bool kexec_free_initrd(void) static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) { /* Load the built in initramfs */ - char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); + char *err = unpack_to_rootfs(__builtin_initramfs_start, __builtin_initramfs_size); if (err) panic_show_mem("%s", err); /* Failed to decompress INTERNAL initramfs */ diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index cd67edc38797..64ca648a80e2 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -27,8 +27,8 @@ __irf_start: .incbin "usr/initramfs_inc_data" __irf_end: .section .init.ramfs.info,"a" -.globl __initramfs_size -__initramfs_size: +.globl __builtin_initramfs_size +__builtin_initramfs_size: #ifdef CONFIG_64BIT .quad __irf_end - __irf_start #else -- 2.47.2