summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-08-05 01:49:05 +0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-08-05 01:49:05 +0400
commita70ce4b6064b64477ed12ef1878980f842819094 (patch)
tree0864f1eea8570a8d3bf713d135b09d00858a4e3d /drivers/xen
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
parent086748e52fb072ff0935ba4512e29c421bd5b716 (diff)
downloadlinux-a70ce4b6064b64477ed12ef1878980f842819094.tar.xz
Merge branch 'upstream/core' into upstream/xen
* 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
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenbus/xenbus_probe.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 3479332113e9..abc12426ef0a 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -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;
}