diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-29 09:39:26 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-03 10:04:54 +0200 |
commit | c2980d8c2961113f24863f70d8ad016f55224c81 (patch) | |
tree | 642962c363fe11d2ead4caffeaaf712629259dfa /drivers/char/agp/agp.h | |
parent | agp: tidy up handling of scratch pages w.r.t. DMA API (diff) | |
download | linux-c2980d8c2961113f24863f70d8ad016f55224c81.tar.xz linux-c2980d8c2961113f24863f70d8ad016f55224c81.zip |
agp: Switch agp_{un,}map_page() to take struct page * argument
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/char/agp/agp.h')
-rw-r--r-- | drivers/char/agp/agp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 17e6d0d3ba36..4c6e5079d870 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -122,8 +122,8 @@ struct agp_bridge_driver { int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); void (*chipset_flush)(struct agp_bridge_data *); - int (*agp_map_page)(void *addr, dma_addr_t *ret); - void (*agp_unmap_page)(void *addr, dma_addr_t dma); + int (*agp_map_page)(struct page *page, dma_addr_t *ret); + void (*agp_unmap_page)(struct page *page, dma_addr_t dma); int (*agp_map_memory)(struct agp_memory *mem); void (*agp_unmap_memory)(struct agp_memory *mem); }; @@ -139,7 +139,7 @@ struct agp_bridge_data { u32 __iomem *gatt_table; u32 *gatt_table_real; unsigned long scratch_page; - unsigned long scratch_page_real; + struct page *scratch_page_page; dma_addr_t scratch_page_dma; unsigned long gart_bus_addr; unsigned long gatt_bus_addr; |