git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
machine_kexec.c
diff --git
a/arch/powerpc/kernel/machine_kexec.c
b/arch/powerpc/kernel/machine_kexec.c
index
7ee50f0
..
6658a15
100644
(file)
--- a/
arch/powerpc/kernel/machine_kexec.c
+++ b/
arch/powerpc/kernel/machine_kexec.c
@@
-126,7
+126,7
@@
void __init reserve_crashkernel(void)
/* We might have got these values via the command line or the
* device tree, either way sanitise them now. */
/* We might have got these values via the command line or the
* device tree, either way sanitise them now. */
- crash_size =
crashk_res.end - crashk_res.start + 1
;
+ crash_size =
resource_size(&crashk_res)
;
#ifndef CONFIG_RELOCATABLE
if (crashk_res.start != KDUMP_KERNELBASE)
#ifndef CONFIG_RELOCATABLE
if (crashk_res.start != KDUMP_KERNELBASE)
@@
-222,7
+222,7
@@
static void __init export_crashk_values(struct device_node *node)
if (crashk_res.start != 0) {
prom_add_property(node, &crashk_base_prop);
if (crashk_res.start != 0) {
prom_add_property(node, &crashk_base_prop);
- crashk_size =
crashk_res.end - crashk_res.start + 1
;
+ crashk_size =
resource_size(&crashk_res)
;
prom_add_property(node, &crashk_size_prop);
}
}
prom_add_property(node, &crashk_size_prop);
}
}