|
 |
a6d77e |
From 224112c147c398df25c543fcea42b3a75635c417 Mon Sep 17 00:00:00 2001
|
|
|
a6d77e |
Message-Id: <224112c147c398df25c543fcea42b3a75635c417.1431592766.git.panand@redhat.com>
|
|
|
a6d77e |
In-Reply-To: <1fb6841aa15407dbf371589d7abca7bc2d35815c.1431592766.git.panand@redhat.com>
|
|
|
a6d77e |
References: <1fb6841aa15407dbf371589d7abca7bc2d35815c.1431592766.git.panand@redhat.com>
|
|
|
a6d77e |
From: Mark Salter <msalter@redhat.com>
|
|
|
a6d77e |
Date: Mon, 27 Apr 2015 11:18:25 -0400
|
|
|
a6d77e |
Subject: [PATCH 17/17] Don't bail out if check_cpu_nodes() fails
|
|
|
a6d77e |
|
|
|
a6d77e |
Current check_cpu_nodes() will fail if firmware does not provide a
|
|
|
a6d77e |
devicetree with cpu nodes. When booting with ACPI, we cannot count
|
|
|
a6d77e |
on a devicetree with cpu nodes. For now, just warn on error rather
|
|
|
a6d77e |
than bailing out. This will allow kexec to work with moonshot.
|
|
|
a6d77e |
|
|
|
a6d77e |
Signed-off-by: Mark Salter <msalter@redhat.com>
|
|
|
a6d77e |
---
|
|
|
a6d77e |
kexec/arch/arm64/kexec-arm64.c | 2 +-
|
|
|
a6d77e |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a6d77e |
|
|
|
a6d77e |
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
|
|
|
a6d77e |
index d884c7c1707d..12c589f8001c 100644
|
|
|
a6d77e |
--- a/kexec/arch/arm64/kexec-arm64.c
|
|
|
a6d77e |
+++ b/kexec/arch/arm64/kexec-arm64.c
|
|
|
a6d77e |
@@ -639,7 +639,7 @@ int arm64_load_other_segments(struct kexec_info *info,
|
|
|
a6d77e |
result = check_cpu_nodes(&dtb_1, &dtb_2);
|
|
|
a6d77e |
|
|
|
a6d77e |
if (result)
|
|
|
a6d77e |
- return result;
|
|
|
a6d77e |
+ fprintf(stderr, "kexec: Warning: No device tree available.\n");
|
|
|
a6d77e |
|
|
|
a6d77e |
/*
|
|
|
a6d77e |
* Put the DTB after the kernel with an alignment of 128 KiB, giving
|
|
|
a6d77e |
--
|
|
|
a6d77e |
2.1.0
|
|
|
a6d77e |
|