cpuidle: fix HP nx6125 regression

[pandora-kernel.git] / arch / i386 / kernel / apm.c

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 4112afe..f02a8ac 100644 (file)
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -222,6 +222,7 @@
 #include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/freezer.h>
 #include <linux/smp.h>
 #include <linux/dmi.h>
 #include <linux/suspend.h>
@@ -2234,7 +2235,7 @@ static int __init apm_init(void)
                apm_info.bios.cseg_16_len = 0; /* 64k */
 
        if (debug) {
-               printk(KERN_INFO "apm: entry %x:%lx cseg16 %x dseg %x",
+               printk(KERN_INFO "apm: entry %x:%x cseg16 %x dseg %x",
                        apm_info.bios.cseg, apm_info.bios.offset,
                        apm_info.bios.cseg_16, apm_info.bios.dseg);
                if (apm_info.bios.version > 0x100)
@@ -2311,7 +2312,6 @@ static int __init apm_init(void)
                remove_proc_entry("apm", NULL);
                return err;
        }
-       kapmd_task->flags |= PF_NOFREEZE;
        wake_up_process(kapmd_task);
 
        if (num_online_cpus() > 1 && !smp ) {