| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1465714475-24111-6-git-send-email-ysato@users.sourceforge.jp> Date: Sun, 12 Jun 2016 15:54:23 +0900 From: Yoshinori Sato <ysato@...rs.sourceforge.jp> To: linux-sh@...r.kernel.org, linux-kernel@...r.kernel.org Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp> Subject: [PATCH v2 05/17] sh: command line passing chosen/bootargs in devicetree Signed-off-by: Yoshinori Sato <ysato@...rs.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(); + +#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(); -- 2.7.0
Powered by blists - more mailing lists