| Message ID | 1465714475-24111-6-git-send-email-ysato@users.sourceforge.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/12/2016 9:54 AM, Yoshinori Sato wrote: > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> > --- > arch/sh/kernel/setup.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c > index 8e3b099..d97de16 100644 > --- a/arch/sh/kernel/setup.c > +++ b/arch/sh/kernel/setup.c > @@ -280,6 +280,8 @@ void __init setup_arch(char **cmdline_p) > #endif > enable_mmu(); > > + Another empty line hardly needed here. > +#ifndef CONFIG_OF > ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); > > printk(KERN_NOTICE "Boot params:\n" [...] MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 8e3b099..d97de16 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -280,6 +280,8 @@ void __init setup_arch(char **cmdline_p) #endif enable_mmu(); + +#ifndef CONFIG_OF ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); printk(KERN_NOTICE "Boot params:\n" @@ -301,6 +303,7 @@ void __init setup_arch(char **cmdline_p) if (!MOUNT_ROOT_RDONLY) root_mountflags &= ~MS_RDONLY; +#endif init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext; init_mm.end_data = (unsigned long) _edata; @@ -323,9 +326,13 @@ void __init setup_arch(char **cmdline_p) #endif #endif +#if !defined(CONFIG_OF) || defined(USE_BUILTIN_DTB) /* Save unparsed command line copy for /proc/cmdline */ memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; +#else + *cmdline_p = boot_command_line; +#endif parse_early_param();
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- arch/sh/kernel/setup.c | 7 +++++++ 1 file changed, 7 insertions(+)