Commit cdae0ad5 authored by Rusty Russell's avatar Rusty Russell
Browse files

lguest: move panic notifier registration to its expected place. 



We used to defer it, so lockdep was happy.  We now init lockdep early
anyway, so just do it after that.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent f1b0ef06

arch/x86/lguest/boot.c

+4 −6
Original line number Diff line number Diff line
@@ -1135,11 +1135,6 @@ static struct notifier_block paniced = { 
/* Setting up memory is fairly easy. */

static __init char *lguest_memory_setup(void)

{

	/* We do this here and not earlier because lockcheck used to barf if we

	 * did it before start_kernel().  I think we fixed that, so it'd be

	 * nice to move it back to lguest_init.  Patch welcome... */

	atomic_notifier_chain_register(&panic_notifier_list, &paniced);



	/*

	 *The Linux bootloader header contains an "e820" memory map: the

	 * Launcher populated the first entry with our memory limit.
@@ -1364,10 +1359,13 @@ __init void lguest_init(void) 


	/*

	 * If we don't initialize the lock dependency checker now, it crashes

	 * paravirt_disable_iospace.

	 * atomic_notifier_chain_register, then paravirt_disable_iospace.

	 */

	lockdep_init();



	/* Hook in our special panic hypercall code. */

	atomic_notifier_chain_register(&panic_notifier_list, &paniced);



	/*

	 * The IDE code spends about 3 seconds probing for disks: if we reserve

	 * all the I/O ports up front it can't get them and so doesn't probe.