diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 11:53:28 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 11:53:28 -0400 |
| commit | 884411d9a580814910bc21dc08e2495efc4b1491 (patch) | |
| tree | 2201bf0c3d2b14f7e6505001300604e6a0164b5c /arch/ia64 | |
| parent | 5a2d853ffcf961d6b7d491858946878676aeae3e (diff) | |
| parent | 38953d3945aedf8e198b75ff09b22e369f14566f (diff) | |
Merge branch 'acpi-processor'
* acpi-processor:
ACPI: Move BAD_MADT_ENTRY() to linux/acpi.h
ACPI / processor: Make it possible to get APIC ID via GIC
ACPI / processor: Build idle_boot_override on x86 and ia64
ACPI / processor: Use ACPI_PROCESSOR_DEVICE_HID instead of "ACPI0007"
ACPI / processor: Fix acpi_processor_eval_pdc() return value type
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 07d209c9507f..467497ade45f 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -54,10 +54,6 @@ | |||
| 54 | #include <asm/sal.h> | 54 | #include <asm/sal.h> |
| 55 | #include <asm/cyclone.h> | 55 | #include <asm/cyclone.h> |
| 56 | 56 | ||
| 57 | #define BAD_MADT_ENTRY(entry, end) ( \ | ||
| 58 | (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ | ||
| 59 | ((struct acpi_subtable_header *)entry)->length < sizeof(*entry)) | ||
| 60 | |||
| 61 | #define PREFIX "ACPI: " | 57 | #define PREFIX "ACPI: " |
| 62 | 58 | ||
| 63 | unsigned int acpi_cpei_override; | 59 | unsigned int acpi_cpei_override; |