Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62419
b: refs/heads/master
c: 0b11e1c
h: refs/heads/master
i:
  62417: e4d2fdb
  62415: 443b845
v: v3
  • Loading branch information
Yinghai Lu authored and Linus Torvalds committed Jul 22, 2007
1 parent ba3fb81 commit e8399f1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 820a149705c2c2a37989554a4f4a34e3d0b0df1f
refs/heads/master: 0b11e1c6a604014283af70e27e0f32971407fd6d
8 changes: 4 additions & 4 deletions trunk/arch/x86_64/kernel/pci-calgary.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ static int calgary_nontranslate_map_sg(struct device* dev,
return nelems;
}

int calgary_map_sg(struct device *dev, struct scatterlist *sg,
static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
int nelems, int direction)
{
struct iommu_table *tbl = find_iommu_table(dev);
Expand Down Expand Up @@ -474,7 +474,7 @@ int calgary_map_sg(struct device *dev, struct scatterlist *sg,
return 0;
}

dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
static dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
size_t size, int direction)
{
dma_addr_t dma_handle = bad_dma_address;
Expand All @@ -493,7 +493,7 @@ dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
return dma_handle;
}

void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
static void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
size_t size, int direction)
{
struct iommu_table *tbl = find_iommu_table(dev);
Expand All @@ -506,7 +506,7 @@ void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
iommu_free(tbl, dma_handle, npages);
}

void* calgary_alloc_coherent(struct device *dev, size_t size,
static void* calgary_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag)
{
void *ret = NULL;
Expand Down

0 comments on commit e8399f1

Please sign in to comment.