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

Commit 9bd47bf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
  ACPICA: Update version to 20090521.
  ACPICA: Disable preservation of SCI enable bit (SCI_EN)
  ACPICA: Region deletion: Ensure region object is removed from handler list
  ACPICA: Eliminate extra call to NsGetParentNode
  ACPICA: Simplify internal operation region interface
  ACPICA: Update Load() to use operation region interfaces
  ACPICA: New: AcpiInstallMethod - install a single control method
  ACPICA: Invalidate DdbHandle after table unload
  ACPICA: Fix reference count issues for DdbHandle object
  ACPICA: Simplify and optimize NsGetNextNode function
  ACPICA: Additional validation of _PRT packages (resource mgr)
  ACPICA: Fix DebugObject output for DdbHandle objects
  ACPICA: Fix allowable release order for ASL mutex objects
  ACPICA: Mutex support: Fix release ordering issue and current sync level
  ACPICA: Update version to 20090422.
  ACPICA: Linux OSL: cleanup/update/merge
  ACPICA: Fix implementation of AML BreakPoint operator (break to debugger)
  ACPICA: Fix miscellaneous warnings under gcc 4+
  ACPICA: Miscellaneous lint changes
  ACPICA: Fix possible dereference of null pointer
  ...
parents 46a50661 d6a1cd49

drivers/acpi/acpica/acevents.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ acpi_status acpi_ev_initialize_op_regions(void); 
acpi_status

acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,

			       u32 function,

			       acpi_physical_address address,

			       u32 region_offset,

			       u32 bit_width, acpi_integer * value);



acpi_status

drivers/acpi/acpica/acglobal.h

+0 −3
Original line number Diff line number Diff line
@@ -362,9 +362,6 @@ extern u8 acpi_gbl_method_executing; 
extern u8 acpi_gbl_abort_method;

extern u8 acpi_gbl_db_terminate_threads;



ACPI_EXTERN int optind;

ACPI_EXTERN char *optarg;



ACPI_EXTERN u8 acpi_gbl_db_opt_tables;

ACPI_EXTERN u8 acpi_gbl_db_opt_stats;

ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;

drivers/acpi/acpica/aclocal.h

+8 −4
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ struct acpi_namespace_node { 
#define ANOBJ_METHOD_LOCAL              0x08	/* Node is a method local */

#define ANOBJ_SUBTREE_HAS_INI           0x10	/* Used to optimize device initialization */

#define ANOBJ_EVALUATED                 0x20	/* Set on first evaluation of node */

#define ANOBJ_ALLOCATED_BUFFER          0x40	/* Method AML buffer is dynamic (install_method) */



#define ANOBJ_IS_EXTERNAL               0x08	/* i_aSL only: This object created via External() */

#define ANOBJ_METHOD_NO_RETVAL          0x10	/* i_aSL only: Method has no return value */
@@ -788,11 +789,14 @@ struct acpi_bit_register_info { 
/* For control registers, both ignored and reserved bits must be preserved */



/*

 * The ACPI spec says to ignore PM1_CTL.SCI_EN (bit 0)

 * but we need to be able to write ACPI_BITREG_SCI_ENABLE directly

 * as a BIOS workaround on some machines.

 * For PM1 control, the SCI enable bit (bit 0, SCI_EN) is defined by the

 * ACPI specification to be a "preserved" bit - "OSPM always preserves this

 * bit position", section 4.7.3.2.1. However, on some machines the OS must

 * write a one to this bit after resume for the machine to work properly.

 * To enable this, we no longer attempt to preserve this bit. No machines

 * are known to fail if the bit is not preserved. (May 2009)

 */

#define ACPI_PM1_CONTROL_IGNORED_BITS           0x0200	/* Bits 9 */

#define ACPI_PM1_CONTROL_IGNORED_BITS           0x0200	/* Bit 9 */

#define ACPI_PM1_CONTROL_RESERVED_BITS          0xC1F8	/* Bits 14-15, 3-8 */

#define ACPI_PM1_CONTROL_PRESERVED_BITS \

	       (ACPI_PM1_CONTROL_IGNORED_BITS | ACPI_PM1_CONTROL_RESERVED_BITS)

drivers/acpi/acpica/acnamesp.h

+11 −2
Original line number Diff line number Diff line
@@ -99,8 +99,17 @@ acpi_ns_walk_namespace(acpi_object_type type, 
		       acpi_walk_callback user_function,

		       void *context, void **return_value);



struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node

						  *parent, struct acpi_namespace_node

struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node

						  *parent,

						  struct acpi_namespace_node

						  *child);



struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type,

							struct

							acpi_namespace_node

							*parent,

							struct

							acpi_namespace_node

							*child);



/*

drivers/acpi/acpica/amlcode.h

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ typedef enum { 


#define AML_METHOD_ARG_COUNT        0x07

#define AML_METHOD_SERIALIZED       0x08

#define AML_METHOD_SYNCH_LEVEL      0xF0

#define AML_METHOD_SYNC_LEVEL       0xF0



/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */