From 97e74a67020c764a06b6146cc97de6e7e56eeb1c Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 6 Nov 2005 23:35:35 -0800 Subject: [PATCH] --- yaml --- r: 13631 b: refs/heads/master c: 49ebd7c6bb1f70a6c5465925e6ca2f4a32d6a6cd h: refs/heads/master i: 13629: 30ffb9c532ded0233d24fa1df312b1ffd6a5af43 13627: 864f456cc9098e7db2f4591290433d5ade9d696f 13623: ed9b707f188af9e0db6b26c17a6bafa1c69a28d7 13615: 437318f72b3f9419cf3d3cff6e264a09e4a85307 13599: 54b39950d93e83e594cdef35e962ac3478b2cb21 13567: 033ad911f7ee813f8c5895ca7a485527b3e67443 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/i460-agp.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 64e443c2fc2c..c36b8e5f69c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88d51967f56f55a45849efe50858ea7dfa0d38dc +refs/heads/master: 49ebd7c6bb1f70a6c5465925e6ca2f4a32d6a6cd diff --git a/trunk/drivers/char/agp/i460-agp.c b/trunk/drivers/char/agp/i460-agp.c index be2e569ae910..34a444658ffe 100644 --- a/trunk/drivers/char/agp/i460-agp.c +++ b/trunk/drivers/char/agp/i460-agp.c @@ -111,8 +111,10 @@ static int i460_fetch_size (void) if (i460.io_page_shift != I460_IO_PAGE_SHIFT) { printk(KERN_ERR PFX - "I/O (GART) page-size %ZuKB doesn't match expected size %ZuKB\n", - 1UL << (i460.io_page_shift - 10), 1UL << (I460_IO_PAGE_SHIFT)); + "I/O (GART) page-size %luKB doesn't match expected " + "size %luKB\n", + 1UL << (i460.io_page_shift - 10), + 1UL << (I460_IO_PAGE_SHIFT)); return 0; } @@ -539,7 +541,7 @@ static unsigned long i460_mask_memory (struct agp_bridge_data *bridge, { /* Make sure the returned address is a valid GATT entry */ return bridge->driver->masks[0].mask - | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xffffff000) >> 12); + | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xfffff000) >> 12); } struct agp_bridge_driver intel_i460_driver = {