Skip to content

Commit

Permalink
lguest: move panic notifier registration to its expected place.
Browse files Browse the repository at this point in the history
We used to defer it, so lockdep was happy.  We now init lockdep early
anyway, so just do it after that.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Rusty Russell committed Sep 23, 2009
1 parent f1b0ef0 commit cdae0ad
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/x86/lguest/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit cdae0ad

Please sign in to comment.