From: Pierre Willenbrock Date: Fri, 19 Jun 2009 16:31:47 +0000 (+0200) Subject: agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b7af262aba912f52bc6ef76f1bc0960b01b8502;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses Otherwise, the high bits to be stuffed in the unused lower bits of the page address are lost. Signed-off-by: Pierre Willenbrock Signed-off-by: Dave Airlie --- diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 35977bfb6999..8c9d50db5c3a 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -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;