From 224112c147c398df25c543fcea42b3a75635c417 Mon Sep 17 00:00:00 2001 Message-Id: <224112c147c398df25c543fcea42b3a75635c417.1431592766.git.panand@redhat.com> In-Reply-To: <1fb6841aa15407dbf371589d7abca7bc2d35815c.1431592766.git.panand@redhat.com> References: <1fb6841aa15407dbf371589d7abca7bc2d35815c.1431592766.git.panand@redhat.com> From: Mark Salter Date: Mon, 27 Apr 2015 11:18:25 -0400 Subject: [PATCH 17/17] 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 --- 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 d884c7c1707d..12c589f8001c 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 -- 2.1.0