mm, tracing: unify PFN format strings

[linux-2.6-microblaze.git] / drivers / base / devtmpfs.c

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 653c8c6..8be352a 100644 (file)
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -371,7 +371,7 @@ int __init devtmpfs_mount(void)
        return err;
 }
 
-static DECLARE_COMPLETION(setup_done);
+static __initdata DECLARE_COMPLETION(setup_done);
 
 static int handle(const char *name, umode_t mode, kuid_t uid, kgid_t gid,
                  struct device *dev)
@@ -405,7 +405,7 @@ static void __noreturn devtmpfs_work_loop(void)
        }
 }
 
-static int __init devtmpfs_setup(void *p)
+static noinline int __init devtmpfs_setup(void *p)
 {
        int err;
 
@@ -419,7 +419,6 @@ static int __init devtmpfs_setup(void *p)
        init_chroot(".");
 out:
        *(int *)p = err;
-       complete(&setup_done);
        return err;
 }
 
@@ -432,6 +431,7 @@ static int __ref devtmpfsd(void *p)
 {
        int err = devtmpfs_setup(p);
 
+       complete(&setup_done);
        if (err)
                return err;
        devtmpfs_work_loop();