Skip to content

Commit

Permalink
pm: cleanup includes
Browse files Browse the repository at this point in the history
Remove 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>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Magnus Damm authored and Linus Torvalds committed Apr 1, 2009
1 parent a8af789 commit bf9ed57
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
3 changes: 0 additions & 3 deletions arch/powerpc/include/asm/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
24 changes: 0 additions & 24 deletions arch/x86/include/asm/suspend_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit bf9ed57

Please sign in to comment.