agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
authorPierre Willenbrock <pierre@pirsoft.de>
Fri, 19 Jun 2009 16:31:47 +0000 (18:31 +0200)
committerDave Airlie <airlied@redhat.com>
Sat, 20 Jun 2009 04:16:59 +0000 (14:16 +1000)
Otherwise, the high bits to be stuffed in the unused lower bits of the
page address are lost.

Signed-off-by: Pierre Willenbrock <pierre@pirsoft.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/char/agp/intel-agp.c

index 35977bfb6999b90d85c5d445d7f713c513d401e5..8c9d50db5c3a7913fba96958a4a1a433cde90330 100644 (file)
@@ -1198,7 +1198,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
 static unsigned long intel_i965_mask_memory(struct agp_bridge_data *bridge,
                                            struct page *page, int type)
 {
-       unsigned long addr = phys_to_gart(page_to_phys(page));
+       dma_addr_t addr = phys_to_gart(page_to_phys(page));
        /* Shift high bits down */
        addr |= (addr >> 28) & 0xf0;