From 012ef7b6604559ac7815402e75450c3eb6b003d0 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 17 Nov 2011 13:11:21 +0100
Subject: [PATCH] --- yaml --- r: 276144 b: refs/heads/master c:
 53cbcbcf4362ef39e0a692b1d23c395999397fca h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mm/dma-mapping.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c93ab9e3343..1a0f7d1fab51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c8a7c1fbfc7ae2362d26559df26b99c806b68b5
+refs/heads/master: 53cbcbcf4362ef39e0a692b1d23c395999397fca
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
index e4e7f6cba1ab..ab584569930e 100644
--- a/trunk/arch/arm/mm/dma-mapping.c
+++ b/trunk/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) {