add a patch to log pnp resources (from rawhide)
This commit is contained in:
parent
26ea0f2631
commit
48eb5c319b
|
@ -621,6 +621,8 @@ Patch300: create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
|
|||
|
||||
Patch360: disable-xhci-by-default.patch
|
||||
|
||||
Patch370: pnp-log-pnp-resources-as-we-do-for-pci.patch
|
||||
|
||||
Patch380: linux-2.6-defaults-pci_no_msi.patch
|
||||
Patch381: linux-2.6-defaults-pci_use_crs.patch
|
||||
Patch382: linux-2.6-defaults-no-pm-async.patch
|
||||
|
@ -1283,6 +1285,8 @@ ApplyPatch linux-2.6-debug-taint-vm.patch
|
|||
ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
|
||||
ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
|
||||
|
||||
ApplyPatch pnp-log-pnp-resources-as-we-do-for-pci.patch
|
||||
|
||||
#
|
||||
# PCI
|
||||
#
|
||||
|
@ -2092,6 +2096,10 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Mon Nov 29 2010 Kyle McMartin <kyle@redhat.com>
|
||||
- PNP: log PNP resources, as we do for PCI [c1f3f281]
|
||||
should help us debug resource conflicts (requested by bjorn.)
|
||||
|
||||
* Mon Nov 29 2010 Kyle McMartin <kyle@redhat.com>
|
||||
- drm/ttm: Fix two race conditions + fix busy codepaths [1df6a2eb] (#615505)
|
||||
|
||||
|
|
|
@ -0,0 +1,84 @@
|
|||
From 8ba192510be47fc327c59449a4b5d347e9669329 Mon Sep 17 00:00:00 2001
|
||||
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
||||
Date: Wed, 29 Sep 2010 12:24:23 -0600
|
||||
Subject: PNP: log PNP resources, as we do for PCI
|
||||
|
||||
ACPI devices are often involved in address space conflicts with PCI devices,
|
||||
so I think it's worth logging the resources they use. Otherwise we have to
|
||||
depend on lspnp or groping around in sysfs to find them.
|
||||
|
||||
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
||||
Signed-off-by: Len Brown <len.brown@intel.com>
|
||||
---
|
||||
drivers/pnp/core.c | 5 +++--
|
||||
drivers/pnp/resource.c | 10 +++++-----
|
||||
2 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
|
||||
index 5dba909..e457f99 100644
|
||||
--- a/drivers/pnp/core.c
|
||||
+++ b/drivers/pnp/core.c
|
||||
@@ -191,8 +191,9 @@ int pnp_add_device(struct pnp_dev *dev)
|
||||
for (id = dev->id; id; id = id->next)
|
||||
len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
|
||||
|
||||
- pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
|
||||
- dev->protocol->name, buf, dev->active ? "active" : "disabled");
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
|
||||
+ dev->protocol->name, buf,
|
||||
+ dev->active ? "active" : "disabled");
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
|
||||
index e3446ab..a925e6b 100644
|
||||
--- a/drivers/pnp/resource.c
|
||||
+++ b/drivers/pnp/resource.c
|
||||
@@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
|
||||
res->start = irq;
|
||||
res->end = irq;
|
||||
|
||||
- pnp_dbg(&dev->dev, " add %pr\n", res);
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
|
||||
return pnp_res;
|
||||
}
|
||||
|
||||
@@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
|
||||
res->start = dma;
|
||||
res->end = dma;
|
||||
|
||||
- pnp_dbg(&dev->dev, " add %pr\n", res);
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
|
||||
return pnp_res;
|
||||
}
|
||||
|
||||
@@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
|
||||
res->start = start;
|
||||
res->end = end;
|
||||
|
||||
- pnp_dbg(&dev->dev, " add %pr\n", res);
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
|
||||
return pnp_res;
|
||||
}
|
||||
|
||||
@@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
|
||||
res->start = start;
|
||||
res->end = end;
|
||||
|
||||
- pnp_dbg(&dev->dev, " add %pr\n", res);
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
|
||||
return pnp_res;
|
||||
}
|
||||
|
||||
@@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev,
|
||||
res->start = start;
|
||||
res->end = end;
|
||||
|
||||
- pnp_dbg(&dev->dev, " add %pr\n", res);
|
||||
+ dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
|
||||
return pnp_res;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.3.2
|
||||
|
Loading…
Reference in New Issue