diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-01 05:55:08 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-01 05:55:08 -0700 |
| commit | aad408d0015e779e04167fe3043fd4999db5a0bd (patch) | |
| tree | 252a5131acfaf3eaa9bdb5080165c5652111c125 /include | |
| parent | 054cb79567437ca10de7bdfa14131c558df98819 (diff) | |
| parent | 69181b5b8626b5b94e8897ca1cf58c0006128f59 (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 | ||||
| -rw-r--r-- | include/linux/suspend.h | 1 |
2 files changed, 4 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; diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 132db86c961a..ed8d796f1849 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -53,6 +53,7 @@ extern suspend_pagedir_t *pagedir_nosave __nosavedata; extern void do_suspend_lowlevel(int resume); extern void do_suspend_lowlevel_s4bios(int resume); +extern int software_suspend(void); #else /* CONFIG_SOFTWARE_SUSPEND */ static inline int software_suspend(void) { |