Commit 1f602454 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Linus Torvalds

[efficeon-agp] Add missing memory mask

Original patch by Benjamin Herrenschmidt after debugging by Brian Hinz.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Brian Hinz <bphinz@hotmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1d73135e
...@@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic_masks[] = ...@@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic_masks[] =
{.mask = 0x00000001, .type = 0} {.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] = static struct aper_size_info_lvl2 efficeon_generic_sizes[4] =
{ {
{256, 65536, 0}, {256, 65536, 0},
...@@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t ...@@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t
last_page = NULL; last_page = NULL;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int index = pg_start + 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]; page = (unsigned int *) efficeon_private.l1_table[index >> 10];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment