This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 6416eab..09c99e8 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -50,12 +50,8 @@
 #include <asm/setup.h>
 
 #include <linux/ckrm.h>
-#ifdef CONFIG_CKRM_CPU_SCHEDULE
 int __init init_ckrm_sched_res(void);
-#else
-#define init_ckrm_sched_res() ((void)0)
-#endif
-//#include <linux/ckrm_sched.h>
+
 
 /*
  * This is one of the first .c files built. Error out early
@@ -109,16 +105,6 @@ extern void tc_init(void);
 enum system_states system_state;
 EXPORT_SYMBOL(system_state);
 
-/*
- * The kernel_magic value represents the address of _end, which allows
- * namelist tools to "match" each other respectively.  That way a tool
- * that looks at /dev/mem can verify that it is using the right System.map
- * file -- if kernel_magic doesn't equal the namelist value of _end,
- * something's wrong.
- */
-extern unsigned long _end;
-unsigned long *kernel_magic = &_end;
-
 /*
  * Boot command-line arguments
  */
@@ -477,7 +463,6 @@ asmlinkage void __init start_kernel(void)
         * printk() and can access its per-cpu storage.
         */
        smp_prepare_boot_cpu();
-
        /*
         * Set up the scheduler prior starting any interrupts (such as the
         * timer interrupt). Full topology setup happens at smp_init()
@@ -697,9 +682,7 @@ static int init(void * unused)
         * firmware files.
         */
        populate_rootfs();
-
        do_basic_setup();
-
        init_ckrm_sched_res();
 
        sched_init_smp();