diff options
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 4 | ||||
| -rw-r--r-- | include/linux/acpi.h | 4 |
3 files changed, 4 insertions, 8 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; |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 1dac94265b59..123f9e37eee4 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -53,10 +53,6 @@ EXPORT_SYMBOL(acpi_disabled); | |||
| 53 | # include <asm/proto.h> | 53 | # include <asm/proto.h> |
| 54 | #endif /* X86 */ | 54 | #endif /* X86 */ |
| 55 | 55 | ||
| 56 | #define BAD_MADT_ENTRY(entry, end) ( \ | ||
| 57 | (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ | ||
| 58 | ((struct acpi_subtable_header *)entry)->length < sizeof(*entry)) | ||
| 59 | |||
| 60 | #define PREFIX "ACPI: " | 56 | #define PREFIX "ACPI: " |
| 61 | 57 | ||
| 62 | int acpi_noirq; /* skip ACPI IRQ initialization */ | 58 | int acpi_noirq; /* skip ACPI IRQ initialization */ |
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) | |||
| 108 | } | 108 | } |
| 109 | #endif | 109 | #endif |
| 110 | 110 | ||
| 111 | #define BAD_MADT_ENTRY(entry, end) ( \ | ||
| 112 | (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ | ||
| 113 | ((struct acpi_subtable_header *)entry)->length < sizeof(*entry)) | ||
| 114 | |||
| 111 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); | 115 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); |
| 112 | void __acpi_unmap_table(char *map, unsigned long size); | 116 | void __acpi_unmap_table(char *map, unsigned long size); |
| 113 | int early_acpi_boot_init(void); | 117 | int early_acpi_boot_init(void); |
