Merge branches 'acpi-battery', 'acpi-video' and 'acpi-misc'

[sfrench/cifs-2.6.git] / arch / arm64 / kernel / machine_kexec.c

diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index e16b248699d5c3cbd8e0a665338d861dd83b97d1..19c2d487cb08feb66052642f7bfca776e97445d0 100644 (file)
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -329,8 +329,13 @@ bool crash_is_nosave(unsigned long pfn)
 
        /* in reserved memory? */
        addr = __pfn_to_phys(pfn);
-       if ((addr < crashk_res.start) || (crashk_res.end < addr))
-               return false;
+       if ((addr < crashk_res.start) || (crashk_res.end < addr)) {
+               if (!crashk_low_res.end)
+                       return false;
+
+               if ((addr < crashk_low_res.start) || (crashk_low_res.end < addr))
+                       return false;
+       }
 
        if (!kexec_crash_image)
                return true;