From 00b372aa1f02ea9ef0564963f94217eb686bc386 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 10 Apr 2010 20:26:55 -0700 Subject: [PATCH] --- yaml --- r: 189879 b: refs/heads/master c: e182c77cc291456eed127b1472952ddb59a81a9d h: refs/heads/master i: 189877: f34ac6b037570db6d2fef669fab445520f6c9201 189875: ed7c694ddbd176dcf466099b8bff5be85bc26ebb 189871: 58ffa1dfeaa3953d40c0e84060dbda5d89351ec6 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/pci_common.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5c7643895ee9..8b85f1b15ec5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25ad403f67d7673f38a473ec138d240804785ae3 +refs/heads/master: e182c77cc291456eed127b1472952ddb59a81a9d diff --git a/trunk/arch/sparc/kernel/pci_common.c b/trunk/arch/sparc/kernel/pci_common.c index b775658a927d..8a000583b5cf 100644 --- a/trunk/arch/sparc/kernel/pci_common.c +++ b/trunk/arch/sparc/kernel/pci_common.c @@ -371,14 +371,19 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm) struct resource *rp = kzalloc(sizeof(*rp), GFP_KERNEL); if (!rp) { - prom_printf("Cannot allocate IOMMU resource.\n"); - prom_halt(); + pr_info("%s: Cannot allocate IOMMU resource.\n", + pbm->name); + return; } rp->name = "IOMMU"; rp->start = pbm->mem_space.start + (unsigned long) vdma[0]; rp->end = rp->start + (unsigned long) vdma[1] - 1UL; rp->flags = IORESOURCE_BUSY; - request_resource(&pbm->mem_space, rp); + if (request_resource(&pbm->mem_space, rp)) { + pr_info("%s: Unable to request IOMMU resource.\n", + pbm->name); + kfree(rp); + } } }