From c1f7f1b4f8c06a668ed8d616559eca9e5d52efb0 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 14 Apr 2006 17:25:30 -0700
Subject: [PATCH] --- yaml --- r: 25847 b: refs/heads/master c:
 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 h: refs/heads/master i:   25845:
 a8275061e2feb57df0eda9ca4de229d8482ec1b9   25843:
 765ed04770c4ce14d8decf0e2727bd65d68e2dfd   25839:
 e3e9459da32a5dab168195672f7cbf36b889f6eb v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/char/agp/efficeon-agp.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7bb68032869b..493d7d623267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d73135e55c47ca909c1fbd68f45623b16dc0211
+refs/heads/master: 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2
diff --git a/trunk/drivers/char/agp/efficeon-agp.c b/trunk/drivers/char/agp/efficeon-agp.c
index fed0a87448d8..86a966b65236 100644
--- a/trunk/drivers/char/agp/efficeon-agp.c
+++ b/trunk/drivers/char/agp/efficeon-agp.c
@@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic_masks[] =
 	{.mask = 0x00000001, .type = 0}
 };
 
+/* This function does the same thing as mask_memory() for this chipset... */
+static inline unsigned long efficeon_mask_memory(unsigned long addr)
+{
+	return addr | 0x00000001;
+}
+
 static struct aper_size_info_lvl2 efficeon_generic_sizes[4] =
 {
 	{256, 65536, 0},
@@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t
 	last_page = NULL;
 	for (i = 0; i < count; i++) {
 		int index = pg_start + i;
-		unsigned long insert = mem->memory[i];
+		unsigned long insert = efficeon_mask_memory(mem->memory[i]);
 
 		page = (unsigned int *) efficeon_private.l1_table[index >> 10];