提交 9a5573e3 编写于 作者: M Michael Ellerman 提交者: Paul Mackerras

[PATCH] ppc64: Check of_chosen in check_for_initrd()

You can't call get_property() on a NULL node, so check if of_chosen is set
in check_for_initrd().
Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>

 arch/ppc64/kernel/setup.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 95920324
...@@ -536,15 +536,19 @@ static void __init check_for_initrd(void) ...@@ -536,15 +536,19 @@ static void __init check_for_initrd(void)
DBG(" -> check_for_initrd()\n"); DBG(" -> check_for_initrd()\n");
prop = (u64 *)get_property(of_chosen, "linux,initrd-start", NULL); if (of_chosen) {
if (prop != NULL) { prop = (u64 *)get_property(of_chosen,
initrd_start = (unsigned long)__va(*prop); "linux,initrd-start", NULL);
prop = (u64 *)get_property(of_chosen, "linux,initrd-end", NULL);
if (prop != NULL) { if (prop != NULL) {
initrd_end = (unsigned long)__va(*prop); initrd_start = (unsigned long)__va(*prop);
initrd_below_start_ok = 1; prop = (u64 *)get_property(of_chosen,
} else "linux,initrd-end", NULL);
initrd_start = 0; if (prop != NULL) {
initrd_end = (unsigned long)__va(*prop);
initrd_below_start_ok = 1;
} else
initrd_start = 0;
}
} }
/* If we were passed an initrd, set the ROOT_DEV properly if the values /* If we were passed an initrd, set the ROOT_DEV properly if the values
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册