Merge branch 'acpica'

* acpica:
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.

diff --combined drivers/acpi/acpica/Makefile
index 4be4cc9,f2bb978..c1a9635
--- 1/drivers/acpi/acpica/Makefile
--- 2/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  # Makefile for ACPICA Core interpreter
  #
  
 -ccflags-y                     := -Os
 +ccflags-y                     := -Os -DBUILDING_ACPICA
  ccflags-$(CONFIG_ACPI_DEBUG)  += -DACPI_DEBUG_OUTPUT
  
  # use acpi.o to put all files here into acpi.o modparam namespace
@@@ -157,6 -157,7 +157,7 @@@ acpi-y +=          
        uterror.o       \
        uteval.o        \
        utglobal.o      \
+       uthex.o         \
        utids.o         \
        utinit.o        \
        utlock.o        \
@@@ -175,5 -176,10 +176,10 @@@
        utxferror.o     \
        utxfmutex.o
  
- acpi-$(ACPI_FUTURE_USAGE) += utfileio.o utprint.o uttrack.o utcache.o
+ acpi-$(ACPI_FUTURE_USAGE) +=  \
+       utcache.o               \
+       utfileio.o              \
+       utprint.o               \
+       uttrack.o               \
+       utuuid.o
  

diff --combined include/acpi/acpixf.h
index c3f38bc,04b2c5d..b7c89d4
--- 1/include/acpi/acpixf.h
--- 2/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -46,13 -46,15 +46,13 @@@
  
  /* Current ACPICA subsystem version in YYYYMMDD format */
  
- #define ACPI_CA_VERSION                 0x20140627
+ #define ACPI_CA_VERSION                 0x20140724
  
  #include <acpi/acconfig.h>
  #include <acpi/actypes.h>
  #include <acpi/actbl.h>
  #include <acpi/acbuffer.h>
  
 -extern u8 acpi_gbl_permanent_mmap;
 -
  /*****************************************************************************
   *
   * Macros used for ACPICA globals and configuration
@@@ -887,25 -889,17 +887,25 @@@ ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRI
  /*
   * Divergences
   */
 -acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);
 +ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);
 +
 +ACPI_EXTERNAL_RETURN_STATUS(acpi_status
 +                          acpi_get_id(acpi_handle object,
 +                                      acpi_owner_id * out_type))
  
 -acpi_status acpi_unload_table_id(acpi_owner_id id);
 +ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))
  
 -acpi_status
 -acpi_get_table_with_size(acpi_string signature,
 -             u32 instance, struct acpi_table_header **out_table,
 -             acpi_size *tbl_size);
 +ACPI_EXTERNAL_RETURN_STATUS(acpi_status
 +                          acpi_get_table_with_size(acpi_string signature,
 +                                                   u32 instance,
 +                                                   struct acpi_table_header
 +                                                   **out_table,
 +                                                   acpi_size *tbl_size))
  
 -acpi_status
 -acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,
 -                 void (*callback)(void *));
 +ACPI_EXTERNAL_RETURN_STATUS(acpi_status
 +                          acpi_get_data_full(acpi_handle object,
 +                                             acpi_object_handler handler,
 +                                             void **data,
 +                                             void (*callback)(void *)))
  
  #endif                                /* __ACXFACE_H__ */