Merge commit 'origin/master' into for-linus/xen/master

* commit 'origin/master': (4825 commits)
  Fix build errors due to CONFIG_BRANCH_TRACER=y
  parport: Use the PCI IRQ if offered
  tty: jsm cleanups
  Adjust path to gpio headers
  KGDB_SERIAL_CONSOLE check for module
  Change KCONFIG name
  tty: Blackin CTS/RTS
  Change hardware flow control from poll to interrupt driven
  Add support for the MAX3100 SPI UART.
  lanana: assign a device name and numbering for MAX3100
  serqt: initial clean up pass for tty side
  tty: Use the generic RS485 ioctl on CRIS
  tty: Correct inline types for tty_driver_kref_get()
  splice: fix deadlock in splicing to file
  nilfs2: support nanosecond timestamp
  nilfs2: introduce secondary super block
  nilfs2: simplify handling of active state of segments
  nilfs2: mark minor flag for checkpoint created by internal operation
  nilfs2: clean up sketch file
  nilfs2: super block operations fix endian bug
  ...

Conflicts:
	arch/x86/include/asm/thread_info.h
	arch/x86/lguest/boot.c
	drivers/xen/manage.c

3 files changed, 12 insertions, 9 deletions

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c0c490ea7d1b..cab100acf983 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -47,7 +47,7 @@ config XEN_COMPAT_XENFS
          The old xenstore userspace tools expect to find "xenbus"
          under /proc/xen, but "xenbus" is now found at the root of the
          xenfs filesystem.  Selecting this causes the kernel to create
-         the compatibilty mount point /proc/xen if it is running on
+         the compatibility mount point /proc/xen if it is running on
          a xen platform.
          If in doubt, say yes.
 
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 411cb1fc9279..bdfd584ad853 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -10,7 +10,7 @@ static void enable_hotplug_cpu(int cpu)
         if (!cpu_present(cpu))
                 arch_register_cpu(cpu);
 
-        cpu_set(cpu, cpu_present_map);
+        set_cpu_present(cpu, true);
 }
 
 static void disable_hotplug_cpu(int cpu)
@@ -18,7 +18,7 @@ static void disable_hotplug_cpu(int cpu)
         if (cpu_present(cpu))
                 arch_unregister_cpu(cpu);
 
-        cpu_clear(cpu, cpu_present_map);
+        set_cpu_present(cpu, false);
 }
 
 static int vcpu_online(unsigned int cpu)
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 5269bb4d2496..fddc2025dece 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -39,12 +39,6 @@ static int xen_suspend(void *data)
 
         BUG_ON(!irqs_disabled());
 
-        err = device_power_down(PMSG_SUSPEND);
-        if (err) {
-                printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
-                       err);
-                return err;
-        }
         err = sysdev_suspend(PMSG_SUSPEND);
         if (err) {
                 printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
@@ -107,6 +101,12 @@ static void do_suspend(void)
         printk(KERN_DEBUG "suspending xenstore...\n");
         xs_suspend();
 
+        err = device_power_down(PMSG_SUSPEND);
+        if (err) {
+                printk(KERN_ERR "device_power_down failed: %d\n", err);
+                goto resume_devices;
+        }
+
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
         if (err) {
                 printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
@@ -119,6 +119,9 @@ static void do_suspend(void)
         } else
                 xs_suspend_cancel();
 
+        device_power_up(PMSG_RESUME);
+
+resume_devices:
         device_resume(PMSG_RESUME);
 
         /* Make sure timer events get retriggered on all CPUs */