[PATCHv5 5/8] kexec: Drop condition macro for aarch64

Pingfan Liu piliu at redhat.com
Mon Jul 17 06:07:29 PDT 2023


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 at redhat.com>
To: kexec at lists.infradead.org
Cc: horms at verge.net.au
Cc: ardb at kernel.org
Cc: jeremy.linton at 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




More information about the kexec mailing list