diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 16:53:28 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-21 16:53:28 +0100 |
commit | 884411d9a580814910bc21dc08e2495efc4b1491 (patch) | |
tree | 2201bf0c3d2b14f7e6505001300604e6a0164b5c /include | |
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 'include')
-rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 1151a1dcfe41..6a15dddbaa09 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -108,6 +108,10 @@ static inline void acpi_initrd_override(void *data, size_t size) } #endif +#define BAD_MADT_ENTRY(entry, end) ( \ + (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ + ((struct acpi_subtable_header *)entry)->length < sizeof(*entry)) + char * __acpi_map_table (unsigned long phys_addr, unsigned long size); void __acpi_unmap_table(char *map, unsigned long size); int early_acpi_boot_init(void); |