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

Commit 0faf996f authored Nov 07, 2013 by Rafael J. Wysocki

Merge branch 'acpica'

* acpica: (35 commits)
  ACPICA: Add __init for ACPICA initializers/finalizers.
  ACPICA: Cleanup asmlinkage for ACPICA APIs.
  ACPICA: Update acpidump related header file changes.
  ACPICA: Update compilation environment settings.
  ACPICA: Fix cached object deletion code.
  ACPICA: Remove dead AOPOBJ_INVALID check.
  ACPICA: Cleanup useless memset invocations.
  ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal.
  ACPICA: Fix wrong object length returned by acpi_ut_get_simple_object_size().
  ACPICA: Add new statistics interface.
  ACPICA: Update DMAR table definitions.
  ACPICA: Update RSDP table definitions.
  ACPICA: Update namespace dump code.
  ACPICA: Update check for setting the ANOBJ_IS_EXTERNAL flag.
  ACPICA: Update default space handlers.
  ACPICA: Update version to 20130927.
  ACPICA: Update aclinux.h for new OSL override mechanism.
  ACPICA: Add support to allow host OS to redefine individual OSL prototypes.
  ACPICA: Simplify configuration of global ACPI_REDUCED_HARDWARE macro.
  ACPICA: Fix indentation issues for macro invocations.
  ...

parents ee360d68 45c9f78b

arch/x86/kernel/acpi/sleep.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,17 @@ unsigned long acpi_realmode_flags;
	static char temp_stack[4096];		static char temp_stack[4096];
	#endif		#endif

			/**
			* x86_acpi_enter_sleep_state - enter sleep state
			* @state: Sleep state to enter.
			*
			* Wrapper around acpi_enter_sleep_state() to be called by assmebly.
			*/
			acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state)
			{
			return acpi_enter_sleep_state(state);
			}

	/**		/**
	* x86_acpi_suspend_lowlevel - save kernel state		* x86_acpi_suspend_lowlevel - save kernel state
	*		*

arch/x86/kernel/acpi/sleep.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,3 +17,5 @@ extern void wakeup_long64(void);
	extern void do_suspend_lowlevel(void);		extern void do_suspend_lowlevel(void);

	extern int x86_acpi_suspend_lowlevel(void);		extern int x86_acpi_suspend_lowlevel(void);

			acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state);

arch/x86/kernel/acpi/wakeup_32.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ ENTRY(do_suspend_lowlevel)
	call save_processor_state		call save_processor_state
	call save_registers		call save_registers
	pushl $3		pushl $3
	call acpi_enter_sleep_state		call x86_acpi_enter_sleep_state
	addl $4, %esp		addl $4, %esp

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

arch/x86/kernel/acpi/wakeup_64.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ ENTRY(do_suspend_lowlevel)
	addq $8, %rsp		addq $8, %rsp
	movl $3, %edi		movl $3, %edi
	xorl %eax, %eax		xorl %eax, %eax
	call acpi_enter_sleep_state		call x86_acpi_enter_sleep_state
	/* in case something went wrong, restore the machine status and go on */		/* in case something went wrong, restore the machine status and go on */
	jmp resume_point		jmp resume_point

drivers/acpi/acpica/acdebug.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -113,6 +113,7 @@ void acpi_db_display_handlers(void);
	ACPI_HW_DEPENDENT_RETURN_VOID(void		ACPI_HW_DEPENDENT_RETURN_VOID(void
	acpi_db_generate_gpe(char *gpe_arg,		acpi_db_generate_gpe(char *gpe_arg,
	char *block_arg))		char *block_arg))

	ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))		ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))

	/*		/*
	@@ -243,6 +244,8 @@ void acpi_db_display_history(void);

	char acpi_db_get_from_history(char command_num_arg);		char acpi_db_get_from_history(char command_num_arg);

			char *acpi_db_get_history_by_index(u32 commandd_num);

	/*		/*
	* dbinput - user front-end to the AML debugger		* dbinput - user front-end to the AML debugger
	*/		*/