diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 13:08:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 13:08:47 -0500 |
| commit | 3098a1801f8b92575a5cd69c77d9fa94ea504dde (patch) | |
| tree | 17fdccc7ab184c79a483f3210f02b613c1ba3c37 /arch | |
| parent | 9914712e2e0f80ddcc00c928d3f7a5848d925e1e (diff) | |
| parent | 4c6222587118f0776bdf40d498361d49572c58dd (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] pci_sun4v.c: Section fixes.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index 67d6dce90b1c..5ea2eab1ccda 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
| @@ -625,8 +625,8 @@ static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm) | |||
| 625 | /* XXX register error interrupt handlers XXX */ | 625 | /* XXX register error interrupt handlers XXX */ |
| 626 | } | 626 | } |
| 627 | 627 | ||
| 628 | static unsigned long probe_existing_entries(struct pci_pbm_info *pbm, | 628 | static unsigned long __init probe_existing_entries(struct pci_pbm_info *pbm, |
| 629 | struct iommu *iommu) | 629 | struct iommu *iommu) |
| 630 | { | 630 | { |
| 631 | struct iommu_arena *arena = &iommu->arena; | 631 | struct iommu_arena *arena = &iommu->arena; |
| 632 | unsigned long i, cnt = 0; | 632 | unsigned long i, cnt = 0; |
| @@ -653,7 +653,7 @@ static unsigned long probe_existing_entries(struct pci_pbm_info *pbm, | |||
| 653 | return cnt; | 653 | return cnt; |
| 654 | } | 654 | } |
| 655 | 655 | ||
| 656 | static void pci_sun4v_iommu_init(struct pci_pbm_info *pbm) | 656 | static void __init pci_sun4v_iommu_init(struct pci_pbm_info *pbm) |
| 657 | { | 657 | { |
| 658 | struct iommu *iommu = pbm->iommu; | 658 | struct iommu *iommu = pbm->iommu; |
| 659 | struct property *prop; | 659 | struct property *prop; |