summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-08-01 16:32:00 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-08-01 16:32:00 +1000
commit72b027a3f5452bd6ed6ce385bb486e6fd07a1787 (patch)
treee79b1fa1e63578e411223ab3fc9ecdd08d8819f3 /init
parent80c065d2a7cabc5ad11229d712cc79b49519641c (diff)
initmpfs-use-initramfs-if-rootfstype=-or-root=-specified-checkpatch-fixes
ERROR: that open brace { should be on the previous line #56: FILE: init/do_mounts.c:623: + if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] && + (!root_fs_names || strstr(root_fs_names, "tmpfs"))) + { total: 1 errors, 0 warnings, 36 lines checked ./patches/initmpfs-use-initramfs-if-rootfstype=-or-root=-specified.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Rob Landley <rob@landley.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index bea309e69523..a51cddc2ff8c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -621,12 +621,12 @@ int __init init_rootfs(void)
return err;
if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
- (!root_fs_names || strstr(root_fs_names, "tmpfs")))
- {
+ (!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
err = shmem_init();
is_tmpfs = true;
- } else
+ } else {
err = init_ramfs_fs();
+ }
if (err)
unregister_filesystem(&rootfs_fs_type);