diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2015-08-20 16:02:09 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2015-08-20 16:02:09 +0100 |
| commit | efb396ce0fe2b81bb0b9f80144e3cbbde3f8e498 (patch) | |
| tree | 5990124e7d7d3dd29e5a58922e055720483181dc | |
| parent | 8b57ea7d29a043bed85b54344c33f40a02c4314c (diff) | |
NOT TO BE UPSTREAMED : BAD_MADT_ENTRY() fixup merge commitleg-mainline-20150820.0
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
| -rw-r--r-- | drivers/irqchip/irq-gic-v2m.c | 2 | ||||
| -rw-r--r-- | drivers/irqchip/irq-gic-v3.c | 7 |
2 files changed, 1 insertions, 8 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..6d34402c07ee 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; @@ -938,8 +938,6 @@ gic_acpi_match_gicc(struct acpi_subtable_header *header, struct acpi_madt_generic_interrupt *gicc; gicc = (struct acpi_madt_generic_interrupt *)header; - if (BAD_MADT_GICC_ENTRY(gicc, end)) - return -EINVAL; if ((gicc->flags & ACPI_MADT_ENABLED) && !gicc->gicr_base_address) return -ENODEV; @@ -1005,9 +1003,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; } |