* [PATCH] pm: cleanup includes
@ 2009-02-25 4:06 Magnus Damm
2009-03-10 11:24 ` Pavel Machek
0 siblings, 1 reply; 2+ messages in thread
From: Magnus Damm @ 2009-02-25 4:06 UTC (permalink / raw)
To: linux-pm; +Cc: akpm
From: Magnus Damm <damm@igel.co.jp>
This patch removes unused/duplicate cruft from asm/suspend.h:
- x86_32: remove unused acpi code
- powerpc: remove duplicate prototypes, see linux/suspend.h
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
allmodconfig bzImage builds on x86, powerpc untested
arch/powerpc/include/asm/suspend.h | 3 ---
arch/x86/include/asm/suspend_32.h | 24 ------------------------
2 files changed, 27 deletions(-)
--- 0001/arch/powerpc/include/asm/suspend.h
+++ work/arch/powerpc/include/asm/suspend.h 2009-02-25 12:44:53.000000000 +0900
@@ -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 */
--- 0001/arch/x86/include/asm/suspend_32.h
+++ work/arch/x86/include/asm/suspend_32.h 2009-02-25 12:46:42.000000000 +0900
@@ -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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-10 11:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-25 4:06 [PATCH] pm: cleanup includes Magnus Damm
2009-03-10 11:24 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox