From 3667f653685d54fde0426f038a90bb10d2ec87e2 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 31 Mar 2009 15:23:38 -0700 Subject: [PATCH] --- yaml --- r: 139174 b: refs/heads/master c: bf9ed57d35d64dac5d5651478b5530a89b20ea1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/suspend.h | 3 --- trunk/arch/x86/include/asm/suspend_32.h | 24 ------------------------ 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/[refs] b/[refs] index e491c8e38118..55a5f9fa862b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8af78982ff4c0b3731527b0217d286a343a3089 +refs/heads/master: bf9ed57d35d64dac5d5651478b5530a89b20ea1e diff --git a/trunk/arch/powerpc/include/asm/suspend.h b/trunk/arch/powerpc/include/asm/suspend.h index cbf2c9404c37..c6efc3466aa6 100644 --- a/trunk/arch/powerpc/include/asm/suspend.h +++ b/trunk/arch/powerpc/include/asm/suspend.h @@ -3,7 +3,4 @@ static inline int arch_prepare_suspend(void) { return 0; } -void save_processor_state(void); -void restore_processor_state(void); - #endif /* __ASM_POWERPC_SUSPEND_H */ diff --git a/trunk/arch/x86/include/asm/suspend_32.h b/trunk/arch/x86/include/asm/suspend_32.h index a5074bd0f8be..48dcfa62ea07 100644 --- a/trunk/arch/x86/include/asm/suspend_32.h +++ b/trunk/arch/x86/include/asm/suspend_32.h @@ -24,28 +24,4 @@ struct saved_context { unsigned long return_address; } __attribute__((packed)); -#ifdef CONFIG_ACPI -extern unsigned long saved_eip; -extern unsigned long saved_esp; -extern unsigned long saved_ebp; -extern unsigned long saved_ebx; -extern unsigned long saved_esi; -extern unsigned long saved_edi; - -static inline void acpi_save_register_state(unsigned long return_point) -{ - saved_eip = return_point; - asm volatile("movl %%esp,%0" : "=m" (saved_esp)); - asm volatile("movl %%ebp,%0" : "=m" (saved_ebp)); - asm volatile("movl %%ebx,%0" : "=m" (saved_ebx)); - asm volatile("movl %%edi,%0" : "=m" (saved_edi)); - asm volatile("movl %%esi,%0" : "=m" (saved_esi)); -} - -#define acpi_restore_register_state() do {} while (0) - -/* routines for saving/restoring kernel state */ -extern int acpi_save_state_mem(void); -#endif - #endif /* _ASM_X86_SUSPEND_32_H */