X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init%2Fmain.c;h=6849397dd475fbf9942406dfe5a0f6de3817b13c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=0c0135ad0645ba4f38ab65176025c399452d3be8;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git diff --git a/init/main.c b/init/main.c index 0c0135ad0..6849397dd 100644 --- a/init/main.c +++ b/init/main.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -74,8 +75,6 @@ #error Sorry, your GCC is too old. It builds incorrect kernels. #endif -extern char *linux_banner; - static int init(void *); extern void init_IRQ(void); @@ -156,12 +155,13 @@ static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; +extern struct obs_kernel_param __setup_start[], __setup_end[]; + static int __init obsolete_checksetup(char *line) { struct obs_kernel_param *p; - extern struct obs_kernel_param __setup_start, __setup_end; - p = &__setup_start; + p = __setup_start; do { int n = strlen(p->str); if (!strncmp(line, p->str, n)) { @@ -178,19 +178,10 @@ static int __init obsolete_checksetup(char *line) return 1; } p++; - } while (p < &__setup_end); + } while (p < __setup_end); return 0; } -static unsigned long preset_lpj; -static int __init lpj_setup(char *str) -{ - preset_lpj = simple_strtoul(str,NULL,0); - return 1; -} - -__setup("lpj=", lpj_setup); - /* * This should be approx 2 Bo*oMips to start (note initial shift), and will * still work even if initially too large, it will just take slightly longer @@ -199,67 +190,6 @@ unsigned long loops_per_jiffy = (1<<12); EXPORT_SYMBOL(loops_per_jiffy); -/* - * This is the number of bits of precision for the loops_per_jiffy. Each - * bit takes on average 1.5/HZ seconds. This (like the original) is a little - * better than 1% - */ -#define LPS_PREC 8 - -void __devinit calibrate_delay(void) -{ - unsigned long ticks, loopbit; - int lps_precision = LPS_PREC; - - if (preset_lpj) { - loops_per_jiffy = preset_lpj; - printk("Calibrating delay loop (skipped)... " - "%lu.%02lu BogoMIPS preset\n", - loops_per_jiffy/(500000/HZ), - (loops_per_jiffy/(5000/HZ)) % 100); - } else { - loops_per_jiffy = (1<<12); - - printk(KERN_DEBUG "Calibrating delay loop... "); - while ((loops_per_jiffy <<= 1) != 0) { - /* wait for "start of" clock tick */ - ticks = jiffies; - while (ticks == jiffies) - /* nothing */; - /* Go .. */ - ticks = jiffies; - __delay(loops_per_jiffy); - ticks = jiffies - ticks; - if (ticks) - break; - } - - /* - * Do a binary approximation to get loops_per_jiffy set to - * equal one clock (up to lps_precision bits) - */ - loops_per_jiffy >>= 1; - loopbit = loops_per_jiffy; - while (lps_precision-- && (loopbit >>= 1)) { - loops_per_jiffy |= loopbit; - ticks = jiffies; - while (ticks == jiffies) - /* nothing */; - ticks = jiffies; - __delay(loops_per_jiffy); - if (jiffies != ticks) /* longer than 1 tick */ - loops_per_jiffy &= ~loopbit; - } - - /* Round the value and print it */ - printk("%lu.%02lu BogoMIPS (lpj=%lu)\n", - loops_per_jiffy/(500000/HZ), - (loops_per_jiffy/(5000/HZ)) % 100, - loops_per_jiffy); - } - -} - static int __init debug_kernel(char *str) { if (*str) @@ -287,8 +217,15 @@ static int __init unknown_bootoption(char *param, char *val) { /* Change NUL term back to "=", to make "param" the whole string. */ if (val) { - if (val[-1] == '"') val[-2] = '='; - else val[-1] = '='; + /* param=val or param="val"? */ + if (val == param+strlen(param)+1) + val[-1] = '='; + else if (val == param+strlen(param)+2) { + val[-2] = '='; + memmove(val-1, val, strlen(val)+1); + val--; + } else + BUG(); } /* Handle obsolete-style parameters */ @@ -351,7 +288,6 @@ static int __init init_setup(char *str) __setup("init=", init_setup); extern void setup_arch(char **); -extern void cpu_idle(void); #ifndef CONFIG_SMP @@ -433,20 +369,21 @@ static void __init smp_init(void) */ static void noinline rest_init(void) + __releases(kernel_lock) { kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); numa_default_policy(); unlock_kernel(); - cpu_idle(); + preempt_enable_no_resched(); + cpu_idle(); } /* Check for early params. */ static int __init do_early_param(char *param, char *val) { struct obs_kernel_param *p; - extern struct obs_kernel_param __setup_start, __setup_end; - for (p = &__setup_start; p < &__setup_end; p++) { + for (p = __setup_start; p < __setup_end; p++) { if (p->early && strcmp(param, p->str) == 0) { if (p->setup_func(val) != 0) printk(KERN_WARNING @@ -502,6 +439,11 @@ asmlinkage void __init start_kernel(void) * time - but meanwhile we still have a functioning scheduler. */ sched_init(); + /* + * Disable preemption - early bootup scheduling is extremely + * fragile until we cpu_idle() for the first time. + */ + preempt_disable(); build_all_zonelists(); page_alloc_init(); printk("Kernel command line: %s\n", saved_command_line); @@ -555,7 +497,7 @@ asmlinkage void __init start_kernel(void) proc_caches_init(); buffer_init(); unnamed_dev_init(); - security_scaffolding_startup(); + security_init(); vfs_caches_init(num_physpages); radix_tree_init(); signals_init(); @@ -583,19 +525,19 @@ __setup("initcall_debug", initcall_debug_setup); struct task_struct *child_reaper = &init_task; -extern initcall_t __initcall_start, __initcall_end; +extern initcall_t __initcall_start[], __initcall_end[]; static void __init do_initcalls(void) { initcall_t *call; int count = preempt_count(); - for (call = &__initcall_start; call < &__initcall_end; call++) { + for (call = __initcall_start; call < __initcall_end; call++) { char *msg; if (initcall_debug) { printk(KERN_DEBUG "Calling initcall 0x%p", *call); - print_symbol(": %s()", (unsigned long) *call); + print_fn_descriptor_symbol(": %s()", (unsigned long) *call); printk("\n"); } @@ -632,7 +574,7 @@ static void __init do_basic_setup(void) /* drivers will send hotplug events */ init_workqueues(); usermodehelper_init(); - + key_init(); driver_init(); #ifdef CONFIG_SYSCTL @@ -752,16 +694,3 @@ static int init(void * unused) panic("No init found. Try passing init= option to kernel."); } - -static int early_param_test(char *rest) -{ - printk("early_parm_test: %s\n", rest ?: "(null)"); - return rest ? 0 : -EINVAL; -} -early_param("testsetup", early_param_test); -static int early_setup_test(char *rest) -{ - printk("early_setup_test: %s\n", rest ?: "(null)"); - return 0; -} -__setup("testsetup_long", early_setup_test);