Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279870
b: refs/heads/master
c: bfcd2ea
h: refs/heads/master
v: v3
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Nov 18, 2011
1 parent 0307aca commit f090804
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 7146182c7f446903dea032fc992dca8d61c12750
refs/heads/master: bfcd2ea6a40b33270564d706396f1b514a988d3c
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-bcmring/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ DMA_MemType_t dma_mem_type(void *addr)
{
unsigned long addrVal = (unsigned long)addr;

if (addrVal >= VMALLOC_END) {
if (addrVal >= CONSISTENT_BASE) {
/* NOTE: DMA virtual memory space starts at 0xFFxxxxxx */

/* dma_alloc_xxx pages are physically and virtually contiguous */
Expand Down

0 comments on commit f090804

Please sign in to comment.