diff options
Diffstat (limited to 'arch/powerpc/kernel/machine_kexec.c')
-rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index fa9f6c72f557..e1ec57e87b3b 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c | |||
@@ -218,23 +218,23 @@ static void __init export_crashk_values(struct device_node *node) | |||
218 | * be sure what's in them, so remove them. */ | 218 | * be sure what's in them, so remove them. */ |
219 | prop = of_find_property(node, "linux,crashkernel-base", NULL); | 219 | prop = of_find_property(node, "linux,crashkernel-base", NULL); |
220 | if (prop) | 220 | if (prop) |
221 | prom_remove_property(node, prop); | 221 | of_remove_property(node, prop); |
222 | 222 | ||
223 | prop = of_find_property(node, "linux,crashkernel-size", NULL); | 223 | prop = of_find_property(node, "linux,crashkernel-size", NULL); |
224 | if (prop) | 224 | if (prop) |
225 | prom_remove_property(node, prop); | 225 | of_remove_property(node, prop); |
226 | 226 | ||
227 | if (crashk_res.start != 0) { | 227 | if (crashk_res.start != 0) { |
228 | prom_add_property(node, &crashk_base_prop); | 228 | of_add_property(node, &crashk_base_prop); |
229 | crashk_size = resource_size(&crashk_res); | 229 | crashk_size = resource_size(&crashk_res); |
230 | prom_add_property(node, &crashk_size_prop); | 230 | of_add_property(node, &crashk_size_prop); |
231 | } | 231 | } |
232 | 232 | ||
233 | /* | 233 | /* |
234 | * memory_limit is required by the kexec-tools to limit the | 234 | * memory_limit is required by the kexec-tools to limit the |
235 | * crash regions to the actual memory used. | 235 | * crash regions to the actual memory used. |
236 | */ | 236 | */ |
237 | prom_update_property(node, &memory_limit_prop); | 237 | of_update_property(node, &memory_limit_prop); |
238 | } | 238 | } |
239 | 239 | ||
240 | static int __init kexec_setup(void) | 240 | static int __init kexec_setup(void) |
@@ -249,11 +249,11 @@ static int __init kexec_setup(void) | |||
249 | /* remove any stale properties so ours can be found */ | 249 | /* remove any stale properties so ours can be found */ |
250 | prop = of_find_property(node, kernel_end_prop.name, NULL); | 250 | prop = of_find_property(node, kernel_end_prop.name, NULL); |
251 | if (prop) | 251 | if (prop) |
252 | prom_remove_property(node, prop); | 252 | of_remove_property(node, prop); |
253 | 253 | ||
254 | /* information needed by userspace when using default_machine_kexec */ | 254 | /* information needed by userspace when using default_machine_kexec */ |
255 | kernel_end = __pa(_end); | 255 | kernel_end = __pa(_end); |
256 | prom_add_property(node, &kernel_end_prop); | 256 | of_add_property(node, &kernel_end_prop); |
257 | 257 | ||
258 | export_crashk_values(node); | 258 | export_crashk_values(node); |
259 | 259 | ||