4 files changed, 8 insertions, 21 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a50bdfed2df7..43d6989c275f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -171,7 +171,7 @@ config BSD_PROCESS_ACCT_V3
           process and it's parent. Note that this file format is incompatible
           with previous v0/v1/v2 file formats, so you will need updated tools
           for processing it. A preliminary version of these tools is available
-          at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
+          at <http://www.gnu.org/software/acct/>.
 
 config TASKSTATS
         bool "Export task/process statistics through netlink (EXPERIMENTAL)"
@@ -486,7 +486,7 @@ config PID_NS
         default n
         depends on NAMESPACES && EXPERIMENTAL
         help
-          Suport process id namespaces.  This allows having multiple
+          Support process id namespaces.  This allows having multiple
           process with the same pid as long as they are in different
           pid namespaces.  This is a building block of containers.
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index f769fac4f4c0..3715feb8446d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -23,7 +23,7 @@
 int __initdata rd_doload;       /* 1 = load RAM disk, 0 = don't load */
 
 int root_mountflags = MS_RDONLY | MS_SILENT;
-char * __initdata root_device_name;
+static char * __initdata root_device_name;
 static char __initdata saved_root_name[64];
 static int __initdata root_wait;
 
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 735705d137ff..9aa968d54329 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -11,7 +11,6 @@ void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);
 extern int root_mountflags;
-extern char *root_device_name;
 
 static inline int create_dev(char *name, dev_t dev)
 {
diff --git a/init/main.c b/init/main.c
index 0604cbcaf1e4..20fdc9884b77 100644
--- a/init/main.c
+++ b/init/main.c
@@ -743,13 +743,13 @@ static void __init do_one_initcall(initcall_t fn)
 }
 
 
-extern initcall_t __initcall_start[], __initcall_end[];
+extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
 
 static void __init do_initcalls(void)
 {
         initcall_t *call;
 
-        for (call = __initcall_start; call < __initcall_end; call++)
+        for (call = __early_initcall_end; call < __initcall_end; call++)
                 do_one_initcall(*call);
 
         /* Make sure there is no pending stuff from the initcall sequence */
@@ -774,24 +774,12 @@ static void __init do_basic_setup(void)
         do_initcalls();
 }
 
-static int __initdata nosoftlockup;
-
-static int __init nosoftlockup_setup(char *str)
-{
-        nosoftlockup = 1;
-        return 1;
-}
-__setup("nosoftlockup", nosoftlockup_setup);
-
 static void __init do_pre_smp_initcalls(void)
 {
-        extern int spawn_ksoftirqd(void);
+        initcall_t *call;
 
-        init_call_single_data();
-        migration_init();
-        spawn_ksoftirqd();
-        if (!nosoftlockup)
-                spawn_softlockup_task();
+        for (call = __initcall_start; call < __early_initcall_end; call++)
+                do_one_initcall(*call);
 }
 
 static void run_init_process(char *init_filename)