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.
This commit is contained in:
Коммит
3098a1801f
|
@ -625,8 +625,8 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm)
|
|||
/* XXX register error interrupt handlers XXX */
|
||||
}
|
||||
|
||||
static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
|
||||
struct iommu *iommu)
|
||||
static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm,
|
||||
struct iommu *iommu)
|
||||
{
|
||||
struct iommu_arena *arena = &iommu->arena;
|
||||
unsigned long i, cnt = 0;
|
||||
|
@ -653,7 +653,7 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm,
|
|||
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 property *prop;
|
||||
|
|
Загрузка…
Ссылка в новой задаче