refresh patch

SVN-Revision: 18748
This commit is contained in:
Imre Kaloz 2009-12-11 11:40:05 +00:00
parent 948ecb59d9
commit ac40715c5f

View File

@ -151,7 +151,7 @@
static int kernel_init(void *); static int kernel_init(void *);
@@ -784,12 +785,13 @@ int do_one_initcall(initcall_t fn) @@ -779,12 +780,13 @@ int do_one_initcall(initcall_t fn)
extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[]; extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
@ -167,7 +167,7 @@
do_one_initcall(*call); do_one_initcall(*call);
/* Make sure there is no pending stuff from the initcall sequence */ /* Make sure there is no pending stuff from the initcall sequence */
@@ -812,7 +814,7 @@ static void __init do_basic_setup(void) @@ -807,7 +809,7 @@ static void __init do_basic_setup(void)
driver_init(); driver_init();
init_irq_proc(); init_irq_proc();
do_ctors(); do_ctors();
@ -176,7 +176,7 @@
} }
static void __init do_pre_smp_initcalls(void) static void __init do_pre_smp_initcalls(void)
@@ -873,6 +875,13 @@ static noinline int init_post(void) @@ -868,6 +870,13 @@ static noinline int init_post(void)
panic("No init found. Try passing init= option to kernel."); panic("No init found. Try passing init= option to kernel.");
} }
@ -190,7 +190,7 @@
static int __init kernel_init(void * unused) static int __init kernel_init(void * unused)
{ {
lock_kernel(); lock_kernel();
@@ -917,7 +926,16 @@ static int __init kernel_init(void * unu @@ -912,7 +921,16 @@ static int __init kernel_init(void * unu
if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL; ramdisk_execute_command = NULL;