Blob Blame History Raw
From 5a28b42faa917d06b42f99cceba9599f7ce932b4 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Mon, 27 Apr 2015 11:18:25 -0400
Subject: [PATCH] Don't bail out if check_cpu_nodes() fails

Current check_cpu_nodes() will fail if firmware does not provide a
devicetree with cpu nodes. When booting with ACPI, we cannot count
on a devicetree with cpu nodes. For now, just warn on error rather
than bailing out. This will allow kexec to work with moonshot.

Signed-off-by: Mark Salter <msalter@redhat.com>
---
 kexec/arch/arm64/kexec-arm64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index d884c7c..12c589f 100644
--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -639,7 +639,7 @@ int arm64_load_other_segments(struct kexec_info *info,
 	result =  check_cpu_nodes(&dtb_1, &dtb_2);
 
 	if (result)
-		return result;
+		fprintf(stderr, "kexec: Warning: No device tree available.\n");
 
 	/*
 	 * Put the DTB after the kernel with an alignment of 128 KiB, giving
-- 
1.8.3.1