1 files changed, 47 insertions, 39 deletions

diff --git a/init/main.c b/init/main.c
index 4e9e92bb2b89..2421e1544127 100644
--- a/init/main.c
+++ b/init/main.c
@@ -86,7 +86,6 @@ extern void init_IRQ(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);
 extern void sbus_init(void);
-extern void sysctl_init(void);
 extern void signals_init(void);
 extern void pidhash_init(void);
 extern void pidmap_init(void);
@@ -702,8 +701,8 @@ static void __init do_basic_setup(void)
         usermodehelper_init();
         driver_init();
 
-#ifdef CONFIG_SYSCTL
-        sysctl_init();
+#ifdef CONFIG_PROC_FS
+        init_irq_proc();
 #endif
 
         do_initcalls();
@@ -727,7 +726,49 @@ static void run_init_process(char *init_filename)
         kernel_execve(init_filename, argv_init, envp_init);
 }
 
-static int init(void * unused)
+/* This is a non __init function. Force it to be noinline otherwise gcc
+ * makes it inline to init() and it becomes part of init.text section
+ */
+static int noinline init_post(void)
+{
+        free_initmem();
+        unlock_kernel();
+        mark_rodata_ro();
+        system_state = SYSTEM_RUNNING;
+        numa_default_policy();
+
+        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+
+        (void) sys_dup(0);
+        (void) sys_dup(0);
+
+        if (ramdisk_execute_command) {
+                run_init_process(ramdisk_execute_command);
+                printk(KERN_WARNING "Failed to execute %s\n",
+                                ramdisk_execute_command);
+        }
+
+        /*
+         * We try each of these until one succeeds.
+         *
+         * The Bourne shell can be used instead of init if we are
+         * trying to recover a really broken machine.
+         */
+        if (execute_command) {
+                run_init_process(execute_command);
+                printk(KERN_WARNING "Failed to execute %s.  Attempting "
+                                        "defaults...\n", execute_command);
+        }
+        run_init_process("/sbin/init");
+        run_init_process("/etc/init");
+        run_init_process("/bin/init");
+        run_init_process("/bin/sh");
+
+        panic("No init found.  Try passing init= option to kernel.");
+}
+
+static int __init init(void * unused)
 {
         lock_kernel();
         /*
@@ -775,39 +816,6 @@ static int init(void * unused)
          * we're essentially up and running. Get rid of the
          * initmem segments and start the user-mode stuff..
          */
-        free_initmem();
-        unlock_kernel();
-        mark_rodata_ro();
-        system_state = SYSTEM_RUNNING;
-        numa_default_policy();
-
-        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-                printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-
-        (void) sys_dup(0);
-        (void) sys_dup(0);
-
-        if (ramdisk_execute_command) {
-                run_init_process(ramdisk_execute_command);
-                printk(KERN_WARNING "Failed to execute %s\n",
-                                ramdisk_execute_command);
-        }
-
-        /*
-         * We try each of these until one succeeds.
-         *
-         * The Bourne shell can be used instead of init if we are 
-         * trying to recover a really broken machine.
-         */
-        if (execute_command) {
-                run_init_process(execute_command);
-                printk(KERN_WARNING "Failed to execute %s.  Attempting "
-                                        "defaults...\n", execute_command);
-        }
-        run_init_process("/sbin/init");
-        run_init_process("/etc/init");
-        run_init_process("/bin/init");
-        run_init_process("/bin/sh");
-
-        panic("No init found.  Try passing init= option to kernel.");
+        init_post();
+        return 0;
 }