1 files changed, 6 insertions, 7 deletions

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 60aeeb56948f..df118a825f39 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -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>
@@ -92,8 +93,6 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr,
         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);
 
@@ -106,14 +105,14 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr,
 
                 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;
 }
@@ -139,7 +138,7 @@ static unsigned long __init xen_return_unused_memory(unsigned long max_pfn,
         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;
 }
 
@@ -426,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();