From f0908041901e22ba65a5244015a5c9b5064e9de2 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Thu, 15 Sep 2011 16:23:45 -0400 Subject: [PATCH] --- yaml --- r: 279870 b: refs/heads/master c: bfcd2ea6a40b33270564d706396f1b514a988d3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-bcmring/dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 097f2f33dc86..bfa960024d90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7146182c7f446903dea032fc992dca8d61c12750 +refs/heads/master: bfcd2ea6a40b33270564d706396f1b514a988d3c diff --git a/trunk/arch/arm/mach-bcmring/dma.c b/trunk/arch/arm/mach-bcmring/dma.c index b52b8de91bde..8751582a6cb1 100644 --- a/trunk/arch/arm/mach-bcmring/dma.c +++ b/trunk/arch/arm/mach-bcmring/dma.c @@ -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 */