diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 09:25:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-23 09:25:24 -0700 |
| commit | 12a37b5e2c93f6550b82490c3de6d4eedc509c39 (patch) | |
| tree | 8407735b0d569792ec255a2627b533e403d60663 /arch/sparc/kernel/pci_common.c | |
| parent | 53da1d9456fe7f87a920a78fdbdcf1225d197cb7 (diff) | |
| parent | 0702b30dd821ac8a4103ddbe545518713fdca9be (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix crash with /proc/iomem
sparc64: Reschedule KGDB capture to a software interrupt.
sbus: Auto-load openprom module when device opened.
Diffstat (limited to 'arch/sparc/kernel/pci_common.c')
| -rw-r--r-- | arch/sparc/kernel/pci_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c index 64e6edf17b9d..b775658a927d 100644 --- a/arch/sparc/kernel/pci_common.c +++ b/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"); |