X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-i386%2Fsuspend.h;h=8dbaafe611ffc744b426d944bb893c54445f2e32;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=2febd2d28532b3154c14ea045db41cee665d9a37;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 2febd2d28..8dbaafe61 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h @@ -6,24 +6,14 @@ #include #include -static inline int -arch_prepare_suspend(void) -{ - if (!cpu_has_pse) - return -EPERM; - return 0; -} +static inline int arch_prepare_suspend(void) { return 0; } /* image of the saved processor state */ struct saved_context { u16 es, fs, gs, ss; unsigned long cr0, cr2, cr3, cr4; - u16 gdt_pad; - u16 gdt_limit; - unsigned long gdt_base; - u16 idt_pad; - u16 idt_limit; - unsigned long idt_base; + struct Xgt_desc_struct gdt; + struct Xgt_desc_struct idt; u16 ldt; u16 tss; unsigned long tr; @@ -31,14 +21,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])) - -extern void save_processor_state(void); -extern void restore_processor_state(void); - #ifdef CONFIG_ACPI_SLEEP extern unsigned long saved_eip; extern unsigned long saved_esp; @@ -61,5 +43,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