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

Commit f97013fd authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86, 64-bit: split x86_64_start_kernel 



Split x86_64_start_kernel() into two pieces:

   The first essentially cleans up after head_64.S.  It clears the
   bss, zaps low identity mappings, sets up some early exception
   handlers.

   The second part preserves the boot data, reserves the kernel's
   text/data/bss, pagetables and ramdisk, and then starts the kernel
   proper.

This split is so that Xen can call the second part to do the set up it
needs done.  It doesn't need any of the first part setups, because it
doesn't boot via head_64.S, and its redundant or actively damaging.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 40801175

arch/x86/kernel/head64.c

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ void __init x86_64_start_kernel(char * real_mode_data) 


	early_printk("Kernel really alive\n");



	x86_64_start_reservations(real_mode_data);

}



void __init x86_64_start_reservations(char *real_mode_data)

{

	copy_bootdata(__va(real_mode_data));



	reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS");

include/asm-x86/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ extern unsigned long init_pg_tables_end; 


#else

void __init x86_64_start_kernel(char *real_mode);

void __init x86_64_start_reservations(char *real_mode_data);



#endif /* __i386__ */

#endif /* _SETUP */

#endif /* __ASSEMBLY__ */