From 922626a143aa4d8e62220d69c21892057d483e1b Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 23 Sep 2009 22:26:46 -0600
Subject: [PATCH] --- yaml --- r: 164913 b: refs/heads/master c:
 fb100d78c04ff6053047625d0368d0d4b1d9912a h: refs/heads/master i:   164911:
 5b1fbc2bd4c1e4b09ef3152b5448dac5974445de v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/lguest/page_tables.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1a20f340495f..88d1d2271d66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c1ea3dd718a1d93a726cb3e66665ac4170dcccd
+refs/heads/master: fb100d78c04ff6053047625d0368d0d4b1d9912a
diff --git a/trunk/drivers/lguest/page_tables.c b/trunk/drivers/lguest/page_tables.c
index 232fba6a4882..bf37a31c0e05 100644
--- a/trunk/drivers/lguest/page_tables.c
+++ b/trunk/drivers/lguest/page_tables.c
@@ -996,11 +996,9 @@ static unsigned long setup_pagetables(struct lguest *lg,
 	if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0)
 		return -EFAULT;
 	/*
-	 * And the third PGD entry (ie. addresses 3G-4G).
-	 *
-	 * FIXME: This assumes that PAGE_OFFSET for the Guest is 0xC0000000.
+	 * And the other PGD entry to make the linear mapping at PAGE_OFFSET
 	 */
-	if (copy_to_user(&pgdir[3], &pgd, sizeof(pgd)) != 0)
+	if (copy_to_user(&pgdir[KERNEL_PGD_BOUNDARY], &pgd, sizeof(pgd)))
 		return -EFAULT;
 #else
 	/*