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

Commit f1a2003e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem() 



The function do_suspend_lowlevel() is specific to x86 and defined in
assembly code, so it should be called from the x86 low-level suspend
code rather than from acpi_suspend_enter().

Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and
change the name of the latter to acpi_suspend_lowlevel(), so that the
function's purpose is better reflected by its name.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 979f11b0

arch/ia64/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ static inline const char *acpi_get_sysname (void) 
int acpi_request_vector (u32 int_type);

int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);



/* Routine for saving kernel state during suspend. */

extern int acpi_save_state_mem(void);

/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern unsigned long acpi_wakeup_address;

arch/ia64/kernel/acpi.c

+2 −7
Original line number Diff line number Diff line
@@ -1034,13 +1034,8 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) 
EXPORT_SYMBOL(acpi_unregister_ioapic);



/*

 * acpi_save_state_mem() - save kernel state

 * acpi_suspend_lowlevel() - save kernel state and suspend.

 *

 * TBD when when IA64 starts to support suspend...

 */

int acpi_save_state_mem(void) { return 0; } 



/*

 * do_suspend_lowlevel()

 */

void do_suspend_lowlevel(void) {}
 
int acpi_suspend_lowlevel(void) { return 0; }

arch/x86/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static inline void acpi_disable_pci(void) 
	acpi_noirq_set();

}



/* Routine for saving kernel state during suspend. */

extern int acpi_save_state_mem(void);

/* Low-level suspend routine. */

extern int acpi_suspend_lowlevel(void);



extern unsigned long acpi_wakeup_address;

arch/x86/kernel/acpi/sleep.c

+3 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ static char temp_stack[4096]; 
#endif



/**

 * acpi_save_state_mem - save kernel state

 * acpi_suspend_lowlevel - save kernel state

 *

 * Create an identity mapped page table and copy the wakeup routine to

 * low memory.

 *

 * Note that this is too late to change acpi_wakeup_address.

 */

int acpi_save_state_mem(void)

int acpi_suspend_lowlevel(void)

{

	struct wakeup_header *header;
@@ -107,6 +107,7 @@ int acpi_save_state_mem(void) 
       saved_magic = 0x123456789abcdef0L;

#endif /* CONFIG_64BIT */



	do_suspend_lowlevel();

	return 0;

}

arch/x86/kernel/acpi/sleep.h

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ extern char swsusp_pg_dir[PAGE_SIZE]; 


extern unsigned long acpi_copy_wakeup_routine(unsigned long);

extern void wakeup_long64(void);



extern void do_suspend_lowlevel(void);