From c148ef7723cdd80cc1f4ee07a57bdb5dc910a879 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Tue, 13 May 2008 20:55:40 +0400
Subject: [PATCH] --- yaml --- r: 99379 b: refs/heads/master c:
 0e192b99d7d09f08b445c31ee7c7f3d0bfb27345 h: refs/heads/master i:   99377:
 035c2f06dde4e786daf7ab23745f0b722d2df26b   99375:
 c708c52bffad59345578d1b6382a803574e24e4c v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/head_64.S | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 898b8df4cef8..5c535eb4e4fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05139d8fb445d9a3569071af1c5920fc46191b7b
+refs/heads/master: 0e192b99d7d09f08b445c31ee7c7f3d0bfb27345
diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S
index 7475b4c91f05..d8ed3259e6e4 100644
--- a/trunk/arch/x86/kernel/head_64.S
+++ b/trunk/arch/x86/kernel/head_64.S
@@ -322,11 +322,11 @@ early_idt_ripmsg:
 ENTRY(name)
 
 /* Automate the creation of 1 to 1 mapping pmd entries */
-#define PMDS(START, PERM, COUNT)		\
-	i = 0 ;					\
-	.rept (COUNT) ;				\
-	.quad	(START) + (i << 21) + (PERM) ;	\
-	i = i + 1 ;				\
+#define PMDS(START, PERM, COUNT)			\
+	i = 0 ;						\
+	.rept (COUNT) ;					\
+	.quad	(START) + (i << PMD_SHIFT) + (PERM) ;	\
+	i = i + 1 ;					\
 	.endr
 
 	/*