[PATCH] ARM: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c

Catalin Marinas catalin.marinas at arm.com
Wed Nov 16 11:38:15 EST 2011


Commit 99d1717d introduces dynamic allocation of the consistent_pte
array. The number of PTEs should be calculated based on the number of
PMD entries rather than PGD, hence the PMD_SHIFT.

Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
Cc: Jon Medhurst <tixy at yxit.co.uk>
Cc: Nicolas Pitre <nicolas.pitre at linaro.org>
---
 arch/arm/mm/dma-mapping.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e4e7f6c..ab58456 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -168,7 +168,7 @@ static int __init consistent_init(void)
 	pte_t *pte;
 	int i = 0;
 	unsigned long base = consistent_base;
-	unsigned long num_ptes = (CONSISTENT_END - base) >> PGDIR_SHIFT;
+	unsigned long num_ptes = (CONSISTENT_END - base) >> PMD_SHIFT;
 
 	consistent_pte = kmalloc(num_ptes * sizeof(pte_t), GFP_KERNEL);
 	if (!consistent_pte) {




More information about the linux-arm-kernel mailing list