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

Merge branch 'upstream/core' into upstream/xen

Browse Source 
* upstream/core:
  xen/panic: use xen_reboot and fix smp_send_stop
  Xen: register panic notifier to take crashes of xen guests on panic
  xen: support large numbers of CPUs with vcpu info placement
  xen: drop xen_sched_clock in favour of using plain wallclock time
  pvops: do not notify callers from register_xenstore_notifier
  xen: make sure pages are really part of domain before freeing
  xen: release unused free memory
This commit is contained in:
Jeremy Fitzhardinge
2010-08-04 14:49:05 -07:00
parent 9fe6206f40 086748e52f
commit a70ce4b606
6 changed files with 112 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/xen/xenbus/xenbus_probe.c
View File

@ -752,10 +752,7 @@ int register_xenstore_notifier(struct notifier_block *nb)
{
int ret = 0;
if (xenstored_ready > 0)
ret = nb->notifier_call(nb, 0, NULL);
else
blocking_notifier_chain_register(&xenstore_chain, nb);
blocking_notifier_chain_register(&xenstore_chain, nb);
return ret;
}