Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56653
b: refs/heads/master
c: 5f9a3e8
h: refs/heads/master
i:
  56651: dadac28
v: v3
  • Loading branch information
Aubrey Li authored and Linus Torvalds committed May 21, 2007
1 parent 4eb4ee8 commit df10831
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 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: 5079df993c3ab45af10dc9a45b3b9e712fd56f23
refs/heads/master: 5f9a3e899897201a49965cd9e1bb2570b3bde2b5
17 changes: 16 additions & 1 deletion trunk/arch/blackfin/kernel/bfin_dma_5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ unsigned short get_dma_curr_ycount(unsigned int channel)
}
EXPORT_SYMBOL(get_dma_curr_ycount);

void *dma_memcpy(void *dest, const void *src, size_t size)
void *_dma_memcpy(void *dest, const void *src, size_t size)
{
int direction; /* 1 - address decrease, 0 - address increase */
int flag_align; /* 1 - address aligned, 0 - address unaligned */
Expand Down Expand Up @@ -734,6 +734,21 @@ void *dma_memcpy(void *dest, const void *src, size_t size)

return dest;
}

void *dma_memcpy(void *dest, const void *src, size_t size)
{
size_t bulk;
size_t rest;
void * addr;

bulk = (size >> 16) << 16;
rest = size - bulk;
if (bulk)
_dma_memcpy(dest, src, bulk);
addr = _dma_memcpy(dest+bulk, src+bulk, rest);
return addr;
}

EXPORT_SYMBOL(dma_memcpy);

void *safe_dma_memcpy(void *dest, const void *src, size_t size)
Expand Down

0 comments on commit df10831

Please sign in to comment.