diff options
| author | H. Peter Anvin | 2006-04-15 02:25:30 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-04-15 02:41:06 +0200 |
| commit | 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 (patch) | |
| tree | e86c1891af316ad19cdffc0fe648fbb90ac486d5 /drivers/char/agp | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | kernel-qcow2-linux-1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2.tar.gz kernel-qcow2-linux-1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2.tar.xz kernel-qcow2-linux-1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2.zip | |
[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: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/efficeon-agp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c index fed0a87448d8..86a966b65236 100644 --- a/drivers/char/agp/efficeon-agp.c +++ b/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]; |