Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.24 /init/main.c

Filename:/init/main.c
Lines Added:5
Lines Deleted:12
Also changed in: (Previous) 2.6.24-rc8  2.6.24-rc7  2.6.24-rc6  2.6.24-rc5  2.6.24-rc4  2.6.24-rc3 
(Following) 2.6.24-git2  2.6.24-git3  2.6.24-git4  2.6.24-git5  2.6.24-git6  2.6.24-git7 

Location
[  2.6.24
  [  init
     o  main.c

Patch

diff --git a/init/main.c b/init/main.c
index 9def935..80b04b6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -39,6 +39,7 @@
 #include <linux/writeback.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
+#include <linux/cgroup.h>
 #include <linux/efi.h>
 #include <linux/tick.h>
 #include <linux/interrupt.h>
@@ -55,6 +56,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -69,15 +71,7 @@
 /*
  * This is one of the first .c files built. Error out early if we have compiler
  * trouble.
- *
- * Versions of gcc older than that listed below may actually compile and link
- * okay, but the end product can have subtle run time bugs.  To avoid associated
- * bogus bug reports, we flatly refuse to compile with a gcc that is known to be
- * too old from the very beginning.
  */
-#if (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 2)
-#error Sorry, your GCC is too old. It builds incorrect kernels.
-#endif
 
 #if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 0
 #warning gcc-4.1.0 is known to miscompile the kernel.  A different compiler version is recommended.
@@ -287,7 +281,7 @@ static int __init unknown_bootoption(char *param, char *val)
       return 0;
 
    /*
-    * Preemptive maintenance for "why didn't my mispelled command
+    * Preemptive maintenance for "why didn't my misspelled command
     * line work?"
     */
    if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
@@ -523,6 +517,7 @@ asmlinkage void __init start_kernel(void)
     */
    unwind_init();
    lockdep_init();
+   cgroup_init_early();
 
    local_irq_disable();
    early_boot_irqs_off();
@@ -640,6 +635,7 @@ asmlinkage void __init start_kernel(void)
 #ifdef CONFIG_PROC_FS
    proc_root_init();
 #endif
+   cgroup_init();
    cpuset_init();
    taskstats_init_early();
    delayacct_init();
@@ -752,11 +748,8 @@ __setup("nosoftlockup", nosoftlockup_setup);
 static void __init do_pre_smp_initcalls(void)
 {
    extern int spawn_ksoftirqd(void);
-#ifdef CONFIG_SMP
-   extern int migration_init(void);
 
    migration_init();
-#endif
    spawn_ksoftirqd();
    if (!nosoftlockup)
       spawn_softlockup_task();


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.