tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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] pci_sun4v.c: Section fixes.

Linus Torvalds 3098a180 9914712e

+3 -3
unified split
+3 -3
arch/sparc64/kernel/pci_sun4v.c
··· 625 /* XXX register error interrupt handlers XXX */ 626 } 627 628 - static unsigned long probe_existing_entries(struct pci_pbm_info *pbm, 629 - struct iommu *iommu) 630 { 631 struct iommu_arena *arena = &iommu->arena; 632 unsigned long i, cnt = 0; ··· 653 return cnt; 654 } 655 656 - static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) 657 { 658 struct iommu *iommu = pbm->iommu; 659 struct property *prop;
··· 625 /* XXX register error interrupt handlers XXX */ 626 } 627 628 + static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm, 629 + struct iommu *iommu) 630 { 631 struct iommu_arena *arena = &iommu->arena; 632 unsigned long i, cnt = 0; ··· 653 return cnt; 654 } 655 656 + static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm) 657 { 658 struct iommu *iommu = pbm->iommu; 659 struct property *prop;