[IA64] backport Kexec/Kdump: honour non-zero crashkernel offset

From: Horms <horms@verge.net.au>
From Linux upstream, commit ad1c3ba7e54fc38b119c1a7d5c98f9ffb8227fdb

There seems to be a value in both allowing the kernel to determine
the base offset of the crashkernel automatically and allowing
users's to sepcify it.

The old behaviour on ia64, which is still the current behaviour on
most architectures is for the user to always specify the address.
Recently ia64 was changed so that it is always automatically determined.

With this patch the kernel automatically determines the offset if
the supplied value is 0, otherwise it uses the value provided.

This should probably be backed by a documentation change.

Signed-Off-By: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 6f34c879271bf6422db87313bef4f4d523ce1f60..2eb44865af72925e04b798e90ce182d333789fd0 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -299,7 +299,7 @@ reserve_memory (void)
 
 #ifdef CONFIG_KEXEC
        /* crashkernel=size@offset specifies the size to reserve for a crash
-        * kernel.(offset is ingored for keep compatibility with other archs)
+        * kernel. If offset is 0, then it is determined automatically.
         * By reserving this memory we guarantee that linux never set's it
         * up as a DMA target.Useful for holding code to do something
         * appropriate after a kernel panic.
@@ -318,10 +318,16 @@ reserve_memory (void)
 #endif
                if (from) {
                        size = memparse(from + 12, &from);
+                       if (*from == '@')
+                               base = memparse(from+1, &from);
+                       else
+                               base = 0;
                        if (size) {
-                               sort_regions(rsvd_region, n);
-                               base = kdump_find_rsvd_region(size,
-                               rsvd_region, n);
+                               if (!base) {
+                                       sort_regions(rsvd_region, n);
+                                       base = kdump_find_rsvd_region(size,
+                                                               rsvd_region, n);
+                                       }
                                if (base != ~0UL) {
                                        rsvd_region[n].start =
                                                (unsigned long)__va(base);