From: Pingfan Liu <piliu@redhat.com>
To: kexec@lists.infradead.org
Cc: Pingfan Liu <piliu@redhat.com>,
horms@verge.net.au, ardb@kernel.org, jeremy.linton@arm.com
Subject: [PATCHv5 5/8] kexec: Drop condition macro for aarch64
Date: Mon, 17 Jul 2023 21:07:29 +0800 [thread overview]
Message-ID: <20230717130732.22710-6-piliu@redhat.com> (raw)
In-Reply-To: <20230717130732.22710-1-piliu@redhat.com>
Since all arm64 images have transfer from the interface probe() to
probe2(), the snippet dedicated for aarch64 to call probe() can be
dropped now.
Signed-off-by: Pingfan Liu <piliu@redhat.com>
To: kexec@lists.infradead.org
Cc: horms@verge.net.au
Cc: ardb@kernel.org
Cc: jeremy.linton@arm.com
---
kexec/kexec.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/kexec/kexec.c b/kexec/kexec.c
index 5f75179..3238c19 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -730,17 +730,7 @@ static int probe(struct file_type *ft, const char *kern_fname,
ret = initialze_probe(kern_fname, kernel_buf, kernel_size, kernel_fd);
if (ret == 0) {
-#ifdef __aarch64__
- /* handle Image.gz like cases */
- if (is_zlib_file(kern_fname, &kernel_size)) {
- if ((ret = ft->probe(kern_fname, *kernel_size)) >= 0)
- *kernel_fd = ret;
- } else {
- ret = ft->probe(*kernel_buf, *kernel_size);
- }
-#else
ret = ft->probe(*kernel_buf, *kernel_size);
-#endif
} else if (ret == 1) {
ret = ft->probe2(kern_fname, &info);
*kernel_buf = info.kernel_buf;
--
2.31.1
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2023-07-17 13:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 13:07 [PATCHv5 0/8] arm64: zboot support Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 1/8] arm64: Fix some issues with zImage _probe() Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 2/8] kexec: Isolate probe method Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 3/8] kexec: Introduce a new image probe method 'probe2' Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 4/8] arm64: Transfer from probe() to probe2() Pingfan Liu
2023-07-17 13:07 ` Pingfan Liu [this message]
2023-07-17 13:07 ` [PATCHv5 6/8] kexec/zboot: Add arch independent zboot support Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 7/8] arm64: Add ZBOOT PE containing compressed image support Pingfan Liu
2023-07-17 13:07 ` [PATCHv5 8/8] arm64: Hook up the ZBOOT support as vmlinuz Pingfan Liu
2023-07-19 3:02 ` [PATCHv5 0/8] arm64: zboot support Dave Young
2023-07-20 2:04 ` Pingfan Liu
2023-07-20 7:29 ` Dave Young
2023-07-20 8:59 ` Pingfan Liu
2023-07-20 10:08 ` Dave Young
2023-07-20 10:08 ` Dave Young
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=20230717130732.22710-6-piliu@redhat.com \
--to=piliu@redhat.com \
--cc=ardb@kernel.org \
--cc=horms@verge.net.au \
--cc=jeremy.linton@arm.com \
--cc=kexec@lists.infradead.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