From f308fc9965b187a6c29b23bc5d0a43dc44f041d1 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Wed, 18 Mar 2009 23:53:16 -0700 Subject: [PATCH] --- yaml --- r: 132520 b: refs/heads/master c: 192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/pci_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 269a3831a95f..2f723209e003 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42cc77c861e8e850e86252bb5b1e12e006261973 +refs/heads/master: 192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c diff --git a/trunk/arch/sparc/kernel/pci_common.c b/trunk/arch/sparc/kernel/pci_common.c index 64e6edf17b9d..b775658a927d 100644 --- a/trunk/arch/sparc/kernel/pci_common.c +++ b/trunk/arch/sparc/kernel/pci_common.c @@ -368,7 +368,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm) const u32 *vdma = of_get_property(pbm->op->node, "virtual-dma", NULL); if (vdma) { - struct resource *rp = kmalloc(sizeof(*rp), GFP_KERNEL); + struct resource *rp = kzalloc(sizeof(*rp), GFP_KERNEL); if (!rp) { prom_printf("Cannot allocate IOMMU resource.\n");