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

diff --cc drivers/xen/events.c
index c6355802f52128662df563638d8c83adac22ed9b,31493e906bbd71b2fc351d1090fcc41120ea8b58..c7c2cb0a4f714d6f592411ee030deb3b81812dbe
--- 1/drivers/xen/events.c
--- 2/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 5c9dc43c1e94240cf3f25c674a047df4f9f93ea7,6a0739ac5713f4aa12fdce1b208def5b99413f19..9343db21af0100514b877340922d85cb456c9205
--- 1/drivers/xen/xen-balloon.c
--- 2/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);
  
-       target_watch.callback = watch_target;
-       xenstore_notifier.notifier_call = balloon_init_watcher;
 +      register_xen_selfballooning(&balloon_sysdev);
 +
  
        register_xenstore_notifier(&xenstore_notifier);
  

diff --cc drivers/xen/xenbus/xenbus_probe.c
index d4c7a9ffbcb93d880614bbbdfebdfcae9fe47dc1,13b0f05bafb7cd2d294c2d181e68304c66e6d0d8..1d3b3f7b7214342d3a90496178ec191f64e853e1
--- 1/drivers/xen/xenbus/xenbus_probe.c
--- 2/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;
  }
  

diff --cc drivers/xen/xenbus/xenbus_probe_frontend.c
Simple merge