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

Commit 3b6961ba authored by Len Brown's avatar Len Brown
Browse files

ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C... 


ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler'

cd74257b
patched up GTS/BFS -- a feature we want to remove.
So revert it (by hand, due to conflict in sleep.h)
to prepare for GTS/BFS removal.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent ec033d0a

arch/x86/kernel/acpi/sleep.c

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ unsigned long acpi_realmode_flags; 
static char temp_stack[4096];

#endif



asmlinkage void acpi_enter_s3(void)

{

	acpi_enter_sleep_state(3, wake_sleep_flags);

}

/**

 * acpi_suspend_lowlevel - save kernel state

 *

arch/x86/kernel/acpi/sleep.h

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 *	Variables and functions used by the code in sleep.c

 */



#include <linux/linkage.h>

#include <asm/realmode.h>



extern unsigned long saved_video_mode;
@@ -11,7 +10,6 @@ extern long saved_magic; 
extern int wakeup_pmode_return;



extern u8 wake_sleep_flags;

extern asmlinkage void acpi_enter_s3(void);



extern unsigned long acpi_copy_wakeup_routine(unsigned long);

extern void wakeup_long64(void);

arch/x86/kernel/acpi/wakeup_32.S

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ restore_registers: 
ENTRY(do_suspend_lowlevel)

	call	save_processor_state

	call	save_registers

	call	acpi_enter_s3

	pushl	$3

	call	acpi_enter_sleep_state

	addl	$4, %esp



#	In case of S3 failure, we'll emerge here.  Jump

# 	to ret_point to recover

arch/x86/kernel/acpi/wakeup_64.S

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ ENTRY(do_suspend_lowlevel) 
	movq	%rsi, saved_rsi



	addq	$8, %rsp

	call	acpi_enter_s3

	movl	$3, %edi

	xorl	%eax, %eax

	call	acpi_enter_sleep_state

	/* in case something went wrong, restore the machine status and go on */

	jmp	resume_point