Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139174
b: refs/heads/master
c: bf9ed57
h: refs/heads/master
v: v3
  • Loading branch information
Magnus Damm authored and Linus Torvalds committed Apr 1, 2009
1 parent ef0208b commit 3667f65
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a8af78982ff4c0b3731527b0217d286a343a3089
refs/heads/master: bf9ed57d35d64dac5d5651478b5530a89b20ea1e
3 changes: 0 additions & 3 deletions trunk/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 trunk/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 3667f65

Please sign in to comment.