pm: cleanup includes
Subsystems (3)
PATCH 1/1 pm: cleanup includes
From: Magnus Damm <[email protected]>
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 <[email protected]>
---
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(-)
arch/powerpc/include/asm/suspend.h +0 -3
@@ -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 */
arch/x86/include/asm/suspend_32.h +0 -24
@@ -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; - asmvolatile ("movl %%esp,%0" :"=m" (saved_esp)); - asmvolatile ("movl %%ebp,%0" :"=m" (saved_ebp)); - asmvolatile ("movl %%ebx,%0" :"=m" (saved_ebx)); - asmvolatile ("movl %%edi,%0" :"=m" (saved_edi)); - asmvolatile ("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 */
Quoted 7 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch removes unused/duplicate cruft from
asm/suspend.h:
-x86_32: remove unused acpi code
- powerpc: remove duplicate prototypes, seelinux/suspend.hSigned-off-by Magnus Damm <[email protected]>
Not tested but looks ok. ACK.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html