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 66237CA101F for ; Sat, 13 Sep 2025 01:05:24 +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=ZpvNeJWPzKz0nC9CU3GGBWMS9zDaNf88PtAKPrr0hQk=; b=h2SZPzhbQf6CAY Y5zreIvzQpm8yRlijPMNBB/Wt7HSwqH6AhE03RiDW2wTP9eZ9E19IZSZ5wU8zktJHIHTc/RJXLwZ1 XFY1joMsmbJhsH1nzwDWu1RXt/JRTgWLTBbuQOuxGiB1ySoAyyCZh/whNLJrACHXI3t3gKfZqO92E jM8VOxNzsWrC8IT76BJK0D51tr85fc+1Uw9Yx3UJvVnIimcIvr2MnltSInR2KtU5cUk0QDJd7BFIx iNI+3HMx1pM/Na3YA90XAHYFBfTpnO5/2+F6SuqhzAT9qlt25wRlsMvtleiwlRYVmQW2cnX9cGYBP dQ4Fwx3Jtsn3GSpYlmWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxEha-0000000CVOf-1XO7; Sat, 13 Sep 2025 01:05:18 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxEhY-0000000CVND-0JuX for linux-riscv@bombadil.infradead.org; Sat, 13 Sep 2025 01:05:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=GP9Ugv+/JyECL7WTIzAf1i+kYo RpyUCqKNLqLAWrEQIokHsKyIhDX/EcsRf25AKiNajRN1MQSKx/jtRuRfL4ugTMNxVB47ZS6bBzIF9 BsvP+rt888dF2Do2ZdieTdmewMXHXHJ6zyLwOVsOgSA4HqeUlyEMWCXK+X6REGZ2KXVo1M38oFK0a M1dwEmxe/bLtq5L4jLeKGC2I5CWmdRo2ffay2YkpfvD8qvjYZCU8rif4bA4Bwcu/SXUvvqvhrnNjG DuGewB+YF6V2hY9dgC7g6P6Ji82HPsQAJaRC/0doUQ3bptQ+kNCwHRVSpY9AKey8IbB7ZdD9qWxs+ cIdg1Bnw==; Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxEhT-00000006VuQ-3oXF for linux-riscv@lists.infradead.org; Sat, 13 Sep 2025 01:05:14 +0000 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-b078aabeb9fso396828966b.1 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.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=5agMVhmWz9D3tLYyZnqIaP8gTBBboQ75Wn3D7w2vh+Q=; b=US+geqA1KYmyiZk+HrwSQzA72r4oT7AxkcCW6fcHzESalnz9kquh7bK+FNc7Bo9mCf C8n7VpVmEWn3W2cqPeqVIYDN9dkfl7m7ZCQgnj2gbkMszCXeylUMDOtLyHEwoCkUdKqX DXN0jUfiXlxfBVzY/WFCSC46w6L0jR1OZeFmeZMGCsCHdtYqmaOGQj/0nFR+/DuPlinc BGG01GRnvZbLXxc+xAuqk25/F6TNmhtrskNUUsjOou03d3pZP9wv8gv838BVNJ8+GQ3F Qgp6S4VYSbW73+emhaWEiIkc/GY4r+JNZP7+ItISz4v9u8Jp3bKPUzK//8mZMIE76WZr VEBA== 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=dIOms5efZXN3NyL4bQDCwePhZ1A48yjBwVPmvSJmAnBKDq0i9UrgeN1UiYwHaEMIcK xyvpSPeV0xwQ5jeW+7GRwOf6rPCmki2nqqmSDqlQPRaNYQ25Px7xoJeF+WokYykaE+gI Hi5hVrDFCK/d/muePZUeKrUfpe63UaoRVVxo8lXXIARAHkKZ5mUOHTIKXsY5FbTGKWNQ YeLt/PGX1l+JsVgrnuhOpB8WTcqOe0QRoe7Pbvu49UCOa/yBmNiS6+mUR3xPlP2+I4u0 Ea0dWNEK/rfBIRogKtoY3mD019rM5w2ihwDl9gbzPAEOifIHJaTccrVII5YOYbDHNCJk kmcw== X-Forwarded-Encrypted: i=1; AJvYcCXUflm2s3dpDG+73Aq5cgxGiflWeOPgxlw5/GNW7JvlQ+j263abTSvOg1PR1A9N3H9rNJICu7bxKQ0hrg==@lists.infradead.org X-Gm-Message-State: AOJu0YzZjH+3gqZMCEKCvlEmj//xUQBYNztn7LhogPLsRfbDDrO8QaiW h16VJsdOvyE3VN+y45KcPsBa5jMdKv9nMN3g03pY3V+px543Y/MV3QS/ X-Gm-Gg: ASbGncuQpk3y2tXX3fTXu1tc/6GTgB9Yf2kTQjRwqHk6ksD2qiqeGWjoFwEMK3eqXRw 0G2FiRnyDNyamSgBe22k3ZB1evW3blxadqk5U/H3yVJENOFWyksn4L0PaRVgAkIKfCIWjVbenVC x1H665VT/kb2lVixtEpchb1KHyjRFIFUXWdhN+MeDu4fXcKkLi5VGsOCOrjlevLEa6FFLhKt8YZ lTXgi62LM8b6G+JZqb/i7J1wLPH2MjQKecSIhq/mynJqnkhVWVO9HtLwCLBLudrd5NLtM0i36vE GW1cpi+QB8tEr9S3KCHpm3kAU1Nb/u1sBdFpXuEW4fKSysB1RPdKGj//omvXXo3BrOxVWvOKk6/ Qb3F+vwblFhg/SWqTDN4= 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250913_020512_596851_90E977C6 X-CRM114-Status: GOOD ( 15.17 ) 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 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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv