Commit 3098a180 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 9914712e 4c622258

arch/sparc64/kernel/pci_sun4v.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -625,7 +625,7 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm) 
	/* XXX register error interrupt handlers XXX */

	/* XXX register error interrupt handlers XXX */

}

}





static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,

static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,

						   struct iommu *iommu)

						   struct iommu *iommu)

{

{

	struct iommu_arena *arena = &iommu->arena;

	struct iommu_arena *arena = &iommu->arena;
@@ -653,7 +653,7 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm, 
	return cnt;

	return cnt;

}

}





static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm)

static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm)

{

{

	struct iommu *iommu = pbm->iommu;

	struct iommu *iommu = pbm->iommu;

	struct property *prop;

	struct property *prop;