From 9064eec146dcf2c197eb8abd265ba248cfcbcd72 Mon Sep 17 00:00:00 2001 From: Amos Waterland Date: Mon, 12 Jun 2006 23:45:02 -0400 Subject: [PATCH] --- yaml --- r: 28766 b: refs/heads/master c: 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bb59b1810d4..cf8ca394a25b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe87675314b4b1ac7ba339e2a4ab8d739b600d6 +refs/heads/master: 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 57d8a16438a0..8c28eb0cbdac 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -567,7 +567,7 @@ static void __init early_cmdline_parse(void) if ((long)_prom->chosen > 0) l = prom_getprop(_prom->chosen, "bootargs", p, COMMAND_LINE_SIZE-1); #ifdef CONFIG_CMDLINE - if (l == 0) /* dbl check */ + if (l <= 0 || p[0] == '\0') /* dbl check */ strlcpy(RELOC(prom_cmd_line), RELOC(CONFIG_CMDLINE), sizeof(prom_cmd_line)); #endif /* CONFIG_CMDLINE */