Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf9ed57d authored by Magnus Damm's avatar Magnus Damm Committed by Linus Torvalds
Browse files

pm: cleanup includes 



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: default avatarMagnus Damm <damm@igel.co.jp>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8af7898

arch/powerpc/include/asm/suspend.h

+0 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */