vserver 2.0 rc7

[linux-2.6.git] / include / asm-i386 / suspend.h

diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h
index f63799f..08be1e5 100644 (file)
--- a/include/asm-i386/suspend.h
+++ b/include/asm-i386/suspend.h
@@ -10,10 +10,12 @@ static inline int
 arch_prepare_suspend(void)
 {
        /* If you want to make non-PSE machine work, turn off paging
-           in do_magic. swsusp_pg_dir should have identity mapping, so
+           in swsusp_arch_suspend. swsusp_pg_dir should have identity mapping, so
            it could work...  */
-       if (!cpu_has_pse)
+       if (!cpu_has_pse) {
+               printk(KERN_ERR "PSE is required for swsusp.\n");
                return -EPERM;
+       }
        return 0;
 }
 
@@ -34,11 +36,6 @@ struct saved_context {
        unsigned long return_address;
 } __attribute__((packed));
 
-#define loaddebug(thread,register) \
-               __asm__("movl %0,%%db" #register  \
-                       : /* no output */ \
-                       :"r" ((thread)->debugreg[register]))
-
 #ifdef CONFIG_ACPI_SLEEP
 extern unsigned long saved_eip;
 extern unsigned long saved_esp;
@@ -61,5 +58,4 @@ static inline void acpi_save_register_state(unsigned long return_point)
 
 /* routines for saving/restoring kernel state */
 extern int acpi_save_state_mem(void);
-extern int acpi_save_state_disk(void);
 #endif