Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit d68721eb339e9237c11c1fea5f73f86211d14918

Authored by Ivan Kokshaysky
Committed by Linus Torvalds
1 parent 801460d0cf
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

alpha: AGP update (fixes compile failure) 

This brings Alpha AGP platforms in sync with the change to struct
agp_memory (unsigned long *memory => struct page **pages).

Only compile tested (I don't have titan/marvel hardware), but this change
looks pretty straightforward, so hopefully it's ok.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Dave Airlie <airlied@linux.ie>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/alpha/kernel/core_marvel.c
Diff comments   View file @ d68721e
... ... @@ -1016,7 +1016,7 @@
1016 1016 {
1017 1017 struct marvel_agp_aperture *aper = agp->aperture.sysdata;
1018 1018 return iommu_bind(aper->arena, aper->pg_start + pg_start,
1019   - mem->page_count, mem->memory);
  1019 + mem->page_count, mem->pages);
1020 1020 }
1021 1021  
1022 1022 static int
arch/alpha/kernel/core_titan.c
Diff comments   View file @ d68721e
... ... @@ -680,7 +680,7 @@
680 680 {
681 681 struct titan_agp_aperture *aper = agp->aperture.sysdata;
682 682 return iommu_bind(aper->arena, aper->pg_start + pg_start,
683   - mem->page_count, mem->memory);
  683 + mem->page_count, mem->pages);
684 684 }
685 685  
686 686 static int
arch/alpha/kernel/pci_impl.h
Diff comments   View file @ d68721e
... ... @@ -198,6 +198,6 @@
198 198  
199 199 extern int iommu_reserve(struct pci_iommu_arena *, long, long);
200 200 extern int iommu_release(struct pci_iommu_arena *, long, long);
201   -extern int iommu_bind(struct pci_iommu_arena *, long, long, unsigned long *);
  201 +extern int iommu_bind(struct pci_iommu_arena *, long, long, struct page **);
202 202 extern int iommu_unbind(struct pci_iommu_arena *, long, long);
arch/alpha/kernel/pci_iommu.c
Diff comments   View file @ d68721e
... ... @@ -876,7 +876,7 @@
876 876  
877 877 int
878 878 iommu_bind(struct pci_iommu_arena *arena, long pg_start, long pg_count,
879   - unsigned long *physaddrs)
  879 + struct page **pages)
880 880 {
881 881 unsigned long flags;
882 882 unsigned long *ptes;
... ... @@ -896,7 +896,7 @@
896 896 }
897 897  
898 898 for(i = 0, j = pg_start; i < pg_count; i++, j++)
899   - ptes[j] = mk_iommu_pte(physaddrs[i]);
  899 + ptes[j] = mk_iommu_pte(page_to_phys(pages[i]));
900 900  
901 901 spin_unlock_irqrestore(&arena->lock, flags);
902 902