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

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

Merge branch 'acpica' 

* acpica: (29 commits)
  ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."
  ACPICA: Update version to 20140214.
  ACPICA: Prevent infinite loops when traversing corrupted lists.
  ACPICA: Debugger: Add missing objects; Traverse linked lists
  ACPICA: Add text: ACPICA policy for new _OSI strings. No functional change.
  ACPICA: Update for _PRP predefined name.
  ACPICA: Cleanup/improve global variable declarations.
  ACPICA: Comment update - no functional change.
  ACPICA: Do not abort _PRT repair on a single subpackage failure.
  ACPICA: Harden _PRT repair code; check for minimum package length.
  ACPICA: Restore code that repairs NULL package elements in return values.
  ACPICA: Properly handle NULL entries in _PRT return packages.
  ACPICA: Update conditional compilation flags for resource dump functions.
  ACPICA: Predefined names: Add support for the _PRP method.
  ACPICA: Headers: Deploy #pragma pack (push) and (pop).
  ACPICA: Add boot option to disable auto return object repair
  ACPICA: acpidump: Remove integer types translation protection.
  ACPICA: acpidump: Add sparse declarators support.
  ACPICA: Add "Windows 2013" string to _OSI support.
  ACPICA: Update version to 20140114.
  ...
parents 94a81cac 6e596084

Documentation/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -231,6 +231,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	acpi_no_auto_ssdt	[HW,ACPI] Disable automatic loading of SSDT



	acpica_no_return_repair [HW, ACPI]

			Disable AML predefined validation mechanism

			This mechanism can repair the evaluation result to make

			the return objects more ACPI specification compliant.

			This option is useful for developers to identify the

			root cause of an AML interpreter issue when the issue

			has something to do with the repair mechanism.



	acpi_os_name=	[HW,ACPI] Tell ACPI BIOS the name of the OS

			Format: To spoof as Windows 98: ="Microsoft Windows"

drivers/acpi/acpica/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ acpi-y += \ 
	rsaddr.o	\

	rscalc.o	\

	rscreate.o	\

	rsdump.o	\

	rsdumpinfo.o	\

	rsinfo.o	\

	rsio.o		\

	rsirq.o		\
@@ -132,8 +134,6 @@ acpi-y += \ 
	rsutils.o	\

	rsxface.o



acpi-$(ACPI_FUTURE_USAGE) += rsdump.o rsdumpinfo.o



acpi-y +=		\

	tbfadt.o	\

	tbfind.o	\

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2013, Intel Corp.

 * Copyright (C) 2000 - 2014, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2013, Intel Corp.

 * Copyright (C) 2000 - 2014, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,8 @@ ACPI_HW_DEPENDENT_RETURN_VOID(void 
						   char *block_arg))

ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))



void acpi_db_execute_test(char *type_arg);



/*

 * dbconvert - miscellaneous conversion routines

 */

drivers/acpi/acpica/acdispat.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2013, Intel Corp.

 * Copyright (C) 2000 - 2014, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without