From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 19 Oct 2011 19:54:47 +0000 (-0400)
Subject: Merge branch 'stable/drivers-3.2.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~854^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cc98bb36680f64e844ce165a64bd54372f5f7310;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/drivers-3.2.rebased' into uek2-merge

* stable/drivers-3.2.rebased:
  xen: use static initializers in xen-balloon.c
  xenbus: don't rely on xen_initial_domain to detect local xenstore
  xenbus: Fix loopback event channel assuming domain 0
  xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
  xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
  xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
  xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
  xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
  xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive

Conflicts:
	drivers/xen/xen-balloon.c
	drivers/xen/xenbus/xenbus_probe.c
---

cc98bb36680f64e844ce165a64bd54372f5f7310
diff --cc drivers/xen/events.c
index c6355802f521,31493e906bbd..c7c2cb0a4f71
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@@ -876,9 -902,9 +897,9 @@@ static int find_virq(unsigned int virq
  int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
  {
  	struct evtchn_bind_virq bind_virq;
- 	int evtchn, irq;
+ 	int evtchn, irq, ret;
  
 -	spin_lock(&irq_mapping_update_lock);
 +	mutex_lock(&irq_mapping_update_lock);
  
  	irq = per_cpu(virq_to_irq, cpu)[virq];
  
diff --cc drivers/xen/xen-balloon.c
index 5c9dc43c1e94,6a0739ac5713..9343db21af01
--- a/drivers/xen/xen-balloon.c
+++ b/drivers/xen/xen-balloon.c
@@@ -98,10 -100,6 +100,8 @@@ static int __init balloon_init(void
  
  	register_balloon(&balloon_sysdev);
  
 +	register_xen_selfballooning(&balloon_sysdev);
 +
- 	target_watch.callback = watch_target;
- 	xenstore_notifier.notifier_call = balloon_init_watcher;
  
  	register_xenstore_notifier(&xenstore_notifier);
  
diff --cc drivers/xen/xenbus/xenbus_probe.c
index d4c7a9ffbcb9,13b0f05bafb7..1d3b3f7b7214
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@@ -759,12 -782,7 +769,7 @@@ static int __init xenbus_init(void
  	proc_mkdir("xen", NULL);
  #endif
  
- 	return 0;
- 
 - out_error:
 +out_error:
- 	if (page != 0)
- 		free_page(page);
- 
  	return err;
  }