[PATCH 1/5] resources: Print resource ranges when expanding overlaps
Resource names can be too generic to distinguish which resources
overlap; eg.,
kernel: Expanded resource reserved due to conflict with PCI Bus :00
kernel: Expanded resource reserved due to conflict with PCI Bus :00
Rather, print decoded resource info as well; eg.,
kernel: resource: Expanding reserved [mem 0xcfe5ec00-0xcfff]; overlaps
PCI Bus :00 [mem 0xcff0-0xdfff]
kernel: resource: Expanding reserved [mem 0xfe00-0xfeff]; overlaps
PCI Bus :00 [mem 0xf000-0xfe00]
Cc: Bjorn Helgaas
Signed-off-by: Peter Hurley
---
kernel/resource.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/resource.c b/kernel/resource.c
index 73f35d4..461c2e0 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -696,12 +696,13 @@ void insert_resource_expand_to_fit(struct resource *root,
struct resource *new)
break;
/* Ok, expand resource to cover the conflict, then try again ..
*/
+ pr_warn("Expanding %s %pR; overlaps %s %pR\n",
+ new->name, new, conflict->name, conflict);
+
if (conflict->start < new->start)
new->start = conflict->start;
if (conflict->end > new->end)
new->end = conflict->end;
-
- printk("Expanded resource %s due to conflict with %s\n",
new->name, conflict->name);
}
write_unlock(_lock);
}
--
1.7.12.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/5] resources: Print resource ranges when expanding overlaps
Resource names can be too generic to distinguish which resources overlap; eg., kernel: Expanded resource reserved due to conflict with PCI Bus :00 kernel: Expanded resource reserved due to conflict with PCI Bus :00 Rather, print decoded resource info as well; eg., kernel: resource: Expanding reserved [mem 0xcfe5ec00-0xcfff]; overlaps PCI Bus :00 [mem 0xcff0-0xdfff] kernel: resource: Expanding reserved [mem 0xfe00-0xfeff]; overlaps PCI Bus :00 [mem 0xf000-0xfe00] Cc: Bjorn Helgaas bhelg...@google.com Signed-off-by: Peter Hurley pe...@hurleysoftware.com --- kernel/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 73f35d4..461c2e0 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -696,12 +696,13 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new) break; /* Ok, expand resource to cover the conflict, then try again .. */ + pr_warn(Expanding %s %pR; overlaps %s %pR\n, + new-name, new, conflict-name, conflict); + if (conflict-start new-start) new-start = conflict-start; if (conflict-end new-end) new-end = conflict-end; - - printk(Expanded resource %s due to conflict with %s\n, new-name, conflict-name); } write_unlock(resource_lock); } -- 1.7.12.3 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
