Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c85c9c authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] Remove need for early lockdep init 



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: default avatarAndi Kleen <ak@suse.de>
parent 2c8c0e6b

arch/x86_64/kernel/head64.c

+1 −7
Original line number Diff line number Diff line
@@ -45,15 +45,12 @@ static void __init copy_bootdata(char *real_mode_data) 
	new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);

	if (!new_data) {

		if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {

			printk("so old bootloader that it does not support commandline?!\n");

			return;

		}

		new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;

		printk("old bootloader convention, maybe loadlin?\n");

	}

	command_line = (char *) ((u64)(new_data));

	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)
@@ -65,10 +62,7 @@ void __init x86_64_start_kernel(char * real_mode_data) 
	asm volatile("lidt %0" :: "m" (idt_descr));

	clear_bss();



	/*

	 * This must be called really, really early:

	 */

	lockdep_init();

	early_printk("Kernel alive\n");



	/*

	 * switch to init_level4_pgt from boot_level4_pgt

arch/x86_64/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -353,6 +353,8 @@ static void discover_ebda(void) 


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);

 	screen_info = SCREEN_INFO;

	edid_info = EDID_INFO;