git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
suspend.h
diff --git
a/include/asm-i386/suspend.h
b/include/asm-i386/suspend.h
index
2febd2d
..
8dbaafe
100644
(file)
--- a/
include/asm-i386/suspend.h
+++ b/
include/asm-i386/suspend.h
@@
-6,24
+6,14
@@
#include <asm/desc.h>
#include <asm/i387.h>
#include <asm/desc.h>
#include <asm/i387.h>
-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;
/* 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;
u16 ldt;
u16 tss;
unsigned long tr;
@@
-31,14
+21,6
@@
struct saved_context {
unsigned long return_address;
} __attribute__((packed));
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;
#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);
/* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void);
-extern int acpi_save_state_disk(void);
#endif
#endif