From b611ba55d2988e0c702a63d35d978477e02202de Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Wed, 12 Sep 2012 07:03:11 +0000 Subject: [PATCH] --- yaml --- r: 327367 b: refs/heads/master c: 20b739fef0d3c32829e56f7c1a1ecccc2f61a73b h: refs/heads/master i: 327365: ec558ef1293c772ccd338ca0690843a15e6e78b4 327363: df943250678c3a97cd89105ea011e51464c6e74b 327359: 721234770a2c4da7be6b58e771bb8722b94dc303 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/pci_sun4v.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 90daf6c58eb9..3d79d3a83e07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 274504f5e62882bb43ea6599b1308607956f20d9 +refs/heads/master: 20b739fef0d3c32829e56f7c1a1ecccc2f61a73b diff --git a/trunk/arch/sparc/kernel/pci_sun4v.c b/trunk/arch/sparc/kernel/pci_sun4v.c index 7661e84a05a0..051b69caeffd 100644 --- a/trunk/arch/sparc/kernel/pci_sun4v.c +++ b/trunk/arch/sparc/kernel/pci_sun4v.c @@ -594,7 +594,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm) printk(KERN_ERR PFX "Strange virtual-dma[%08x:%08x].\n", vdma[0], vdma[1]); return -EINVAL; - }; + } dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL); num_tsb_entries = vdma[1] / IO_PAGE_SIZE;