Merge back earlier 'acpica' material for v3.18.

const char *acpi_gbl_ll_decode[] = {

	"ActiveHigh",

	"ActiveLow"

	"ActiveLow",

	"ActiveBoth",

	"Reserved"

};

const char *acpi_gbl_max_decode[] = {

#define METHOD_NAME__PRS        "_PRS"

#define METHOD_NAME__PRT        "_PRT"

#define METHOD_NAME__PRW        "_PRW"

#define METHOD_NAME__PS0        "_PS0"

#define METHOD_NAME__PS1        "_PS1"

#define METHOD_NAME__PS2        "_PS2"

#define METHOD_NAME__PS3        "_PS3"

#define METHOD_NAME__REG        "_REG"

#define METHOD_NAME__SB_        "_SB_"

#define METHOD_NAME__SEG        "_SEG"

/* Current ACPICA subsystem version in YYYYMMDD format */

#define ACPI_CA_VERSION                 0x20140724

#define ACPI_CA_VERSION                 0x20140828

#include <acpi/acconfig.h>

#include <acpi/actypes.h>

	ACPI_SRAT_TYPE_CPU_AFFINITY = 0,

	ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1,

	ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2,

	ACPI_SRAT_TYPE_RESERVED = 3	/* 3 and greater are reserved */

	ACPI_SRAT_TYPE_GICC_AFFINITY = 3,

	ACPI_SRAT_TYPE_RESERVED = 4	/* 4 and greater are reserved */

};

/*

	u32 flags;

	u8 local_sapic_eid;

	u8 proximity_domain_hi[3];

	u32 reserved;		/* Reserved, must be zero */

	u32 clock_domain;

};

/* Flags */

#define ACPI_SRAT_CPU_ENABLED       (1)	/* 00: Use affinity structure */

/* 3: GICC Affinity (ACPI 5.1) */

struct acpi_srat_gicc_affinity {

	struct acpi_subtable_header header;

	u32 proximity_domain;

	u32 acpi_processor_uid;

	u32 flags;

	u32 clock_domain;

};

/* Flags for struct acpi_srat_gicc_affinity */

#define ACPI_SRAT_GICC_ENABLED     (1)	/* 00: Use affinity structure */

/* Reset to default packing */

#pragma pack()

	u32 common_flags;

};

/* Flag Definitions: timer_flags and virtual_timer_flags above */

#define ACPI_GTDT_GT_IRQ_MODE               (1)

#define ACPI_GTDT_GT_IRQ_POLARITY           (1<<1)

/* Flag Definitions: common_flags above */

#define ACPI_GTDT_GT_IS_SECURE_TIMER        (1)