diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-01 19:22:34 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-01 19:22:34 -0700 |
| commit | 308f1c41c58a2a43023ddf54d0df6f35a9674232 (patch) | |
| tree | c76467c6b2111e07b63f22233f4a4875a4473780 /include | |
| parent | 596a338d648faae36a2c6cbe94ccdeaa552105aa (diff) | |
| parent | 89f518c1a12fcd9e3347cc4532e8a79f1f04a70c (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/suspend.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 0d22ec30019b..2febd2d28532 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h @@ -6,11 +6,12 @@ #include <asm/desc.h> #include <asm/i387.h> -static inline void +static inline int arch_prepare_suspend(void) { if (!cpu_has_pse) - panic("pse required"); + return -EPERM; + return 0; } /* image of the saved processor state */ @@ -38,8 +39,6 @@ struct saved_context { extern void save_processor_state(void); extern void restore_processor_state(void); -extern int do_magic(int resume); - #ifdef CONFIG_ACPI_SLEEP extern unsigned long saved_eip; extern unsigned long saved_esp; |