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

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

Merge branch 'acpica' 

* acpica: (56 commits)
  ACPICA: Update version to 20130117
  ACPICA: Update predefined info table for _MLS method
  ACPICA: Remove some extraneous newlines in ACPI_ERROR type calls
  ACPICA: iASL/Disassembler: Add option to ignore NOOP opcodes/operators
  ACPICA: AcpiGetSleepTypeData: Allow \_Sx to return either 1 or 2 integers
  ACPICA: Update ACPICA copyrights to 2013
  ACPICA: Update predefined info table
  ACPICA: Cleanup table handler naming conflicts.
  ACPICA: Source restructuring: split large files into 8 new files.
  ACPICA: Cleanup PM_TIMER_FREQUENCY definition.
  ACPICA: Cleanup ACPI_DEBUG_PRINT macros to fix potential build breakages.
  ACPICA: Update version to 20121220.
  ACPICA: Interpreter: Fix Store() when implicit conversion is not possible.
  ACPICA: Resources: Split interrupt share/wake bits into two fields.
  ACPICA: Resources: Support for ACPI 5 wake bit in ExtendedInterrupt descriptor.
  ACPICA: Interpreter: Add warning if 64-bit constant appears in 32-bit table.
  ACPICA: Update ACPICA initialization messages.
  ACPICA: Namespace: Eliminate dot...dot output during initialization.
  ACPICA: Resource manager: Add support for ACPI 5 wake bit in IRQ descriptor.
  ACPICA: Fix possible memory leak in dispatcher error path.
  ...
parents 59893298 21719534

arch/ia64/include/asm/acpi.h

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ 


/* Asm macros */



#define ACPI_ASM_MACROS

#define BREAKPOINT3

#define ACPI_DISABLE_IRQS() local_irq_disable()

#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()



static inline int

arch/x86/include/asm/acpi.h

+0 −4
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ 


/* Asm macros */



#define ACPI_ASM_MACROS

#define BREAKPOINT3

#define ACPI_DISABLE_IRQS() local_irq_disable()

#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



int __acpi_acquire_global_lock(unsigned int *lock);

drivers/acpi/acpica/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ acpi-y += \ 
	evgpeinit.o	\

	evgpeutil.o	\

	evglock.o	\

	evhandler.o	\

	evmisc.o	\

	evregion.o	\

	evrgnini.o	\
@@ -90,6 +91,7 @@ acpi-y += \ 
	nsobject.o	\

	nsparse.o	\

	nspredef.o	\

	nsprepkg.o	\

	nsrepair.o	\

	nsrepair2.o	\

	nssearch.o	\
@@ -104,7 +106,9 @@ acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o 
acpi-y +=		\

	psargs.o	\

	psloop.o	\

	psobject.o	\

	psopcode.o	\

	psopinfo.o	\

	psparse.o	\

	psscope.o	\

	pstree.o	\
@@ -126,7 +130,7 @@ acpi-y += \ 
	rsutils.o	\

	rsxface.o



acpi-$(ACPI_FUTURE_USAGE) += rsdump.o

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



acpi-y +=		\

	tbfadt.o	\
@@ -155,8 +159,10 @@ acpi-y += \ 
	utmutex.o	\

	utobject.o	\

	utosi.o		\

	utownerid.o	\

	utresrc.o	\

	utstate.o	\

	utstring.o	\

	utxface.o	\

	utxfinit.o	\

	utxferror.o	\

drivers/acpi/acpica/accommon.h

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



/*

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

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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@ 
 *

 * Note: The order of these include files is important.

 */

#include <acpi/acconfig.h>	/* Global configuration constants */

#include "acmacros.h"		/* C macros */

#include "aclocal.h"		/* Internal data types */

#include "acobject.h"		/* ACPI internal object */

drivers/acpi/acpica/acdebug.h

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



/*

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

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

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -114,6 +114,21 @@ ACPI_HW_DEPENDENT_RETURN_VOID(void 
			      acpi_db_generate_gpe(char *gpe_arg,

						   char *block_arg))



/*

 * dbconvert - miscellaneous conversion routines

 */

 acpi_status acpi_db_hex_char_to_value(int hex_char, u8 *return_value);



acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object);



acpi_status

acpi_db_convert_to_object(acpi_object_type type,

			  char *string, union acpi_object *object);



u8 *acpi_db_encode_pld_buffer(struct acpi_pld_info *pld_info);



void acpi_db_dump_pld_buffer(union acpi_object *obj_desc);



/*

 * dbmethod - control method commands

 */
@@ -191,6 +206,8 @@ void 
acpi_db_create_execution_threads(char *num_threads_arg,

				 char *num_loops_arg, char *method_name_arg);



void acpi_db_delete_objects(u32 count, union acpi_object *objects);



#ifdef ACPI_DBG_TRACK_ALLOCATIONS

u32 acpi_db_get_cache_info(struct acpi_memory_list *cache);

#endif