From 59d42b5b5391ecb14e8cba9142520fb737255159 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 31 Aug 2015 14:25:53 +0100 Subject: Correct BAD_MADT_ENTRY merge Signed-off-by: Graeme Gregory --- drivers/irqchip/irq-gic-v2m.c | 2 -- drivers/irqchip/irq-gic-v3.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c index cb07ab2daefa..2783706ead10 100644 --- a/drivers/irqchip/irq-gic-v2m.c +++ b/drivers/irqchip/irq-gic-v2m.c @@ -382,8 +382,6 @@ acpi_parse_madt_msi(struct acpi_subtable_header *header, struct acpi_madt_generic_msi_frame *m; m = (struct acpi_madt_generic_msi_frame *)header; - if (BAD_MADT_ENTRY(m, end)) - return -EINVAL; res.start = m->base_address; res.end = m->base_address + 0x1000; diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 34e5443c3955..c7d0f9261a3c 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -925,7 +925,7 @@ gic_acpi_match_redist(struct acpi_subtable_header *header, struct acpi_madt_generic_redistributor *redist; redist = (struct acpi_madt_generic_redistributor *)header; - if (BAD_MADT_ENTRY(redist, end) || !redist->base_address) + if (!redist->base_address) return -EINVAL; return 0; @@ -1005,9 +1005,6 @@ gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header, dist = (struct acpi_madt_generic_distributor *)header; - if (BAD_MADT_ENTRY(dist, end)) - return -EINVAL; - dist_phys_base = dist->base_address; return 0; } -- cgit v1.2.3