From 2accd2817fe10eba2fd970cf39a801ef314dcba0 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Fri, 7 Sep 2007 03:46:15 +1000 Subject: [PATCH] --- yaml --- r: 67302 b: refs/heads/master c: 70c6cc37db342d9f970884e12744ab5ee290d4ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3230bdbd9b8e..82e9f2a21bf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e788ff13be03c2cc4055d5569b7b218dc3f2cb7b +refs/heads/master: 70c6cc37db342d9f970884e12744ab5ee290d4ad diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c index 0028fe68e09e..b081413c72d4 100644 --- a/trunk/arch/powerpc/kernel/prom.c +++ b/trunk/arch/powerpc/kernel/prom.c @@ -779,13 +779,13 @@ static int __init early_init_dt_scan_chosen(unsigned long node, #endif #ifdef CONFIG_KEXEC - lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL); - if (lprop) - crashk_res.start = *lprop; + lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL); + if (lprop) + crashk_res.start = *lprop; - lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL); - if (lprop) - crashk_res.end = crashk_res.start + *lprop - 1; + lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL); + if (lprop) + crashk_res.end = crashk_res.start + *lprop - 1; #endif early_init_dt_check_for_initrd(node);