The patch titled
pnp-replace-pnp_resource_table-with-dynamically-allocated-resources fix
has been removed from the -mm tree. Its filename was
pnp-replace-pnp_resource_table-with-dynamically-allocated-resources-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pnp-replace-pnp_resource_table-with-dynamically-allocated-resources fix
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
We still need the IORESOURCE_DISABLED check for MEM resources there,
and I think it's missing from the version of
pnp-replace-pnp_resource_table-with-dynamically-allocated-resources.patch
that you just added to -mm.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pnp/system.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/pnp/system.c~pnp-replace-pnp_resource_table-with-dynamically-allocated-resources-fix drivers/pnp/system.c
--- a/drivers/pnp/system.c~pnp-replace-pnp_resource_table-with-dynamically-allocated-resources-fix
+++ a/drivers/pnp/system.c
@@ -60,6 +60,8 @@ static void reserve_resources_of_dev(str
int i;
for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+ if (res->flags & IORESOURCE_DISABLED)
+ continue;
if (res->start == 0)
continue; /* disabled */
if (res->start < 0x100)
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
linux-next.patch
mm-only-enforce-acpi-resource-conflict-checks.patch
pnp-set-the-pnp_card-dma_mask-for-use-by-isapnp-cards.patch
isa-set-24-bit-dma_mask-for-isa-devices.patch
make-pnp_add_card_id-static.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
