lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Remove need for early lockdep init

Browse Source 
I think it was only needed for the printks and we can do them later.

I put in a single early_printk so that we know the kernel is alive
(early_printk doesn't need any locks)

This makes some things easier for initialization of unwind for
lockdep, which is needed by later patches.

cc: mingo@elte.hu

Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Andi Kleen
2006-09-26 10:52:32 +02:00
committed by Andi Kleen
parent 2c8c0e6b8d
commit 43c85c9c5d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86_64/kernel/head64.c
View File

@@ -45,15 +45,12 @@ static void __init copy_bootdata(char *real_mode_data)
new_data = *(int *) (x86_boot_params + NEW_CL_POINTER); new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
if (!new_data) { if (!new_data) {
if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) { if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {
printk("so old bootloader that it does not support commandline?!\n");
return; return;
} }
new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET; new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
printk("old bootloader convention, maybe loadlin?\n");
} }
command_line = (char *) ((u64)(new_data)); command_line = (char *) ((u64)(new_data));
memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
printk("Bootdata ok (command line is %s)\n", saved_command_line);
} }
void __init x86_64_start_kernel(char * real_mode_data) void __init x86_64_start_kernel(char * real_mode_data)
@@ -65,10 +62,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
asm volatile("lidt %0" :: "m" (idt_descr)); asm volatile("lidt %0" :: "m" (idt_descr));
clear_bss(); clear_bss();
/* early_printk("Kernel alive\n");
* This must be called really, really early:
*/
lockdep_init();
/* /*
* switch to init_level4_pgt from boot_level4_pgt * switch to init_level4_pgt from boot_level4_pgt

2
arch/x86_64/kernel/setup.c
View File

@@ -353,6 +353,8 @@ static void discover_ebda(void)
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
printk(KERN_INFO "Command line: %s\n", saved_command_line);
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
screen_info = SCREEN_INFO; screen_info = SCREEN_INFO;
edid_info = EDID_INFO; edid_info = EDID_INFO;