torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]  pci_sun4v.c: Section fixes.
This commit is contained in:
Linus Torvalds 2008-02-05 10:08:47 -08:00
commit 3098a1801f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc64/kernel/pci_sun4v.c
View File

@ -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;