Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
  xen: Fix misleading WARN message at xen_release_chunk
  xen: Fix printk() format in xen/setup.c
  xen/tracing: it looks like we wanted CONFIG_FTRACE
  xen/self-balloon: Add dependency on tmem.
  xen/balloon: Fix compile errors - missing header files.
  xen/grant: Fix compile warning.
  xen/pciback: remove duplicated #include

diff --combined arch/x86/xen/setup.c
index a9627e2e3295a9fb97b4032ef6f95d746f2931a5,02ffd9e48c9fd8a992a2d5ca023b86d1e59ee253..df118a825f395cbb4e79b9282594caa77aa6a4ca
--- 1/arch/x86/xen/setup.c
--- 2/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@@ -9,7 -9,6 +9,7 @@@
  #include <linux/mm.h>
  #include <linux/pm.h>
  #include <linux/memblock.h>
 +#include <linux/cpuidle.h>
  
  #include <asm/elf.h>
  #include <asm/vdso.h>
@@@ -93,8 -92,6 +93,6 @@@ static unsigned long __init xen_release
        if (end <= start)
                return 0;
  
-       printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx: ",
-              start, end);
        for(pfn = start; pfn < end; pfn++) {
                unsigned long mfn = pfn_to_mfn(pfn);
  
@@@ -107,14 -104,14 +105,14 @@@
  
                ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
                                           &reservation);
-               WARN(ret != 1, "Failed to release memory %lx-%lx err=%d\n",
-                    start, end, ret);
+               WARN(ret != 1, "Failed to release pfn %lx err=%d\n", pfn, ret);
                if (ret == 1) {
                        __set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
                        len++;
                }
        }
-       printk(KERN_CONT "%ld pages freed\n", len);
+       printk(KERN_INFO "Freeing  %lx-%lx pfn range: %lu pages freed\n",
+              start, end, len);
  
        return len;
  }
@@@ -140,7 -137,7 +138,7 @@@ static unsigned long __init xen_return_
        if (last_end < max_addr)
                released += xen_release_chunk(last_end, max_addr);
  
-       printk(KERN_INFO "released %ld pages of unused memory\n", released);
+       printk(KERN_INFO "released %lu pages of unused memory\n", released);
        return released;
  }
  
@@@ -427,7 -424,7 +425,7 @@@ void __init xen_arch_setup(void
  #ifdef CONFIG_X86_32
        boot_cpu_data.hlt_works_ok = 1;
  #endif
 -      pm_idle = default_idle;
 +      disable_cpuidle();
        boot_option_idle_override = IDLE_HALT;
  
        fiddle_vdso();