---

yaml
---
r: 286475
b: refs/heads/master
c: 04c2599
h: refs/heads/master
i:
  286473: 0c17802
  286471: c2712f1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d1f86572685d577b76142b7c61453000e1a5e26
+refs/heads/master: 04c25997c97e57d95d1f5a7a6e5fff2411dbd48b

trunk/drivers/acpi/acpica/Makefile

@@ -8,151 +8,41 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 # use acpi.o to put all files here into acpi.o modparam namespace
 obj-y	+= acpi.o
 
-acpi-y :=		\
-	dsargs.o	\
-	dscontrol.o	\
-	dsfield.o	\
-	dsinit.o	\
-	dsmethod.o	\
-	dsmthdat.o	\
-	dsobject.o	\
-	dsopcode.o	\
-	dsutils.o	\
-	dswexec.o	\
-	dswload.o	\
-	dswload2.o	\
-	dswscope.o	\
-	dswstate.o
+acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+	 dsinit.o dsargs.o dscontrol.o dswload2.o
 
-acpi-y +=		\
-	evevent.o	\
-	evgpe.o		\
-	evgpeblk.o	\
-	evgpeinit.o	\
-	evgpeutil.o	\
-	evglock.o	\
-	evmisc.o	\
-	evregion.o	\
-	evrgnini.o	\
-	evsci.o		\
-	evxface.o	\
-	evxfevnt.o	\
-	evxfgpe.o	\
-	evxfregn.o
+acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o
 
-acpi-y +=		\
-	exconfig.o	\
-	exconvrt.o	\
-	excreate.o	\
-	exdebug.o	\
-	exdump.o	\
-	exfield.o	\
-	exfldio.o	\
-	exmutex.o	\
-	exnames.o	\
-	exoparg1.o	\
-	exoparg2.o	\
-	exoparg3.o	\
-	exoparg6.o	\
-	exprep.o	\
-	exmisc.o	\
-	exregion.o	\
-	exresnte.o	\
-	exresolv.o	\
-	exresop.o	\
-	exstore.o	\
-	exstoren.o	\
-	exstorob.o	\
-	exsystem.o	\
-	exutils.o
+acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o
 
-acpi-y +=		\
-	hwacpi.o	\
-	hwgpe.o		\
-	hwpci.o		\
-	hwregs.o	\
-	hwsleep.o	\
-	hwvalid.o	\
-	hwxface.o
+acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 
-acpi-y +=		\
-	nsaccess.o	\
-	nsalloc.o	\
-	nsdump.o	\
-	nseval.o	\
-	nsinit.o	\
-	nsload.o	\
-	nsnames.o	\
-	nsobject.o	\
-	nsparse.o	\
-	nspredef.o	\
-	nsrepair.o	\
-	nsrepair2.o	\
-	nssearch.o	\
-	nsutils.o	\
-	nswalk.o	\
-	nsxfeval.o	\
-	nsxfname.o	\
-	nsxfobj.o
+acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+	 nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o
 
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
 
-acpi-y +=		\
-	psargs.o	\
-	psloop.o	\
-	psopcode.o	\
-	psparse.o	\
-	psscope.o	\
-	pstree.o	\
-	psutils.o	\
-	pswalk.o	\
-	psxface.o
+acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+	 psopcode.o  psscope.o  psutils.o  psxface.o
 
-acpi-y +=		\
-	rsaddr.o	\
-	rscalc.o	\
-	rscreate.o	\
-	rsinfo.o	\
-	rsio.o		\
-	rsirq.o		\
-	rslist.o	\
-	rsmemory.o	\
-	rsmisc.o	\
-	rsserial.o	\
-	rsutils.o	\
-	rsxface.o
+acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+	 rscalc.o  rsirq.o  rsmemory.o  rsutils.o
 
 acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
 
-acpi-y +=		\
-	tbfadt.o	\
-	tbfind.o	\
-	tbinstal.o	\
-	tbutils.o	\
-	tbxface.o	\
-	tbxfroot.o
+acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
 
-acpi-y +=		\
-	utaddress.o	\
-	utalloc.o	\
-	utcopy.o	\
-	utdebug.o	\
-	utdecode.o	\
-	utdelete.o	\
-	uteval.o	\
-	utglobal.o	\
-	utids.o		\
-	utinit.o	\
-	utlock.o	\
-	utmath.o	\
-	utmisc.o	\
-	utmutex.o	\
-	utobject.o	\
-	utosi.o		\
-	utresrc.o	\
-	utstate.o	\
-	utxface.o	\
-	utxferror.o	\
-	utxfmutex.o
+acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
+		utosi.o utxferror.o utdecode.o

trunk/drivers/acpi/acpica/accommon.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acconfig.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,10 +123,6 @@
 
 #define ACPI_MAX_SLEEP                  2000	/* Two seconds */
 
-/* Address Range lists are per-space_id (Memory and I/O only) */
-
-#define ACPI_ADDRESS_RANGE_MAX          2
-
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
@@ -206,10 +202,9 @@
 #define ACPI_RSDP_CHECKSUM_LENGTH       20
 #define ACPI_RSDP_XCHECKSUM_LENGTH      36
 
-/* SMBus, GSBus and IPMI bidirectional buffer size */
+/* SMBus and IPMI bidirectional buffer size */
 
 #define ACPI_SMBUS_BUFFER_SIZE          34
-#define ACPI_GSBUS_BUFFER_SIZE          34
 #define ACPI_IPMI_BUFFER_SIZE           66
 
 /* _sx_d and _sx_w control methods */

trunk/drivers/acpi/acpica/acdebug.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acdispat.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acevents.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,6 @@ acpi_status acpi_ev_initialize_op_regions(void);
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
-			       union acpi_operand_object *field_obj,
 			       u32 function,
 			       u32 region_offset, u32 bit_width, u64 *value);
 

trunk/drivers/acpi/acpica/acglobal.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,19 +140,8 @@ u32 acpi_gbl_trace_flags;
 acpi_name acpi_gbl_trace_method_name;
 u8 acpi_gbl_system_awake_and_running;
 
-/*
- * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
- * that the ACPI hardware is no longer required. A flag in the FADT indicates
- * a reduced HW machine, and that flag is duplicated here for convenience.
- */
-u8 acpi_gbl_reduced_hardware;
-
 #endif
 
-/* Do not disassemble buffers to resource descriptors */
-
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
-
 /*****************************************************************************
  *
  * Debug support
@@ -218,7 +207,7 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;
 
 /*****************************************************************************
  *
- * Mutual exclusion within ACPICA subsystem
+ * Mutual exlusion within ACPICA subsystem
  *
  ****************************************************************************/
 
@@ -306,8 +295,6 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
 ACPI_EXTERN u8 acpi_gbl_events_initialized;
 ACPI_EXTERN u8 acpi_gbl_osi_data;
 ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;
-ACPI_EXTERN struct acpi_address_range
-    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];
 
 #ifndef DEFINE_ACPI_GLOBALS
 

trunk/drivers/acpi/acpica/achware.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acinterp.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -468,8 +468,6 @@ void acpi_ex_eisa_id_to_string(char *dest, u64 compressed_id);
 
 void acpi_ex_integer_to_string(char *dest, u64 value);
 
-u8 acpi_is_valid_space_id(u8 space_id);
-
 /*
  * exregion - default op_region handlers
  */