git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xen/dev-evtchn' into upstream/evtchn
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
pci_iommu.c
diff --git
a/arch/alpha/kernel/pci_iommu.c
b/arch/alpha/kernel/pci_iommu.c
index
d1dbd9a
..
022c274
100644
(file)
--- a/
arch/alpha/kernel/pci_iommu.c
+++ b/
arch/alpha/kernel/pci_iommu.c
@@
-223,7
+223,7
@@
iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n)
*/
static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
{
*/
static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask)
{
- dma
64
_addr_t dac_offset = alpha_mv.pci_dac_offset;
+ dma_addr_t dac_offset = alpha_mv.pci_dac_offset;
int ok = 1;
/* If this is not set, the machine doesn't support DAC at all. */
int ok = 1;
/* If this is not set, the machine doesn't support DAC at all. */
@@
-756,7
+756,7
@@
static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,
spin_lock_irqsave(&arena->lock, flags);
for (end = sg + nents; sg < end; ++sg) {
spin_lock_irqsave(&arena->lock, flags);
for (end = sg + nents; sg < end; ++sg) {
- dma
64
_addr_t addr;
+ dma_addr_t addr;
size_t size;
long npages, ofs;
dma_addr_t tend;
size_t size;
long npages, ofs;
dma_addr_t tend;