From: Thorsten Blum <blum@kernel.org>
To: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Ard Biesheuvel <ardb@kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
"Pratyush Yadav (Google)" <pratyush@kernel.org>,
Breno Leitao <leitao@debian.org>,
Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
Thorsten Blum <thorsten.blum@linux.dev>
Cc: Thorsten Blum <blum@kernel.org>, Ingo Molnar <mingo@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] x86/setup: Simplify copy error handling in relocate_initrd()
Date: Wed, 26 Aug 2026 20:10:01 +0200 [thread overview]
Message-ID: <20260826181002.12316-5-blum@kernel.org> (raw)
In-Reply-To: <20260826181002.12316-4-blum@kernel.org>
Check the result of copy_from_early_mem() directly and drop the
now-obsolete local ret variable.
No functional change.
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
arch/x86/kernel/setup.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 1fede9834835..fa1a7c29285e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -322,7 +322,6 @@ static void __init relocate_initrd(void)
u64 ramdisk_image = get_ramdisk_image();
u64 ramdisk_size = get_ramdisk_size();
u64 area_size = PAGE_ALIGN(ramdisk_size);
- int ret = 0;
/* We need to move the initrd down into directly mapped mem */
u64 relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0,
@@ -336,8 +335,7 @@ static void __init relocate_initrd(void)
printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
relocated_ramdisk, relocated_ramdisk + area_size - 1);
- ret = copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_size);
- if (ret)
+ if (copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_size))
panic("Copy RAMDISK failed\n");
printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"
next prev parent reply other threads:[~2026-08-26 18:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-26 18:10 [PATCH 1/3] x86/setup: Fix logged allocation range " Thorsten Blum
2026-08-26 18:10 ` Thorsten Blum [this message]
2026-08-26 18:10 ` [PATCH 3/3] x86/setup: Use pr_info() " Thorsten Blum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260826181002.12316-5-blum@kernel.org \
--to=blum@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=hpa@zytor.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=pratyush@kernel.org \
--cc=rppt@kernel.org \
--cc=tglx@kernel.org \
--cc=thorsten.blum@linux.dev \
--cc=tzimmermann@suse.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®