Commit 0e4f2c45 authored by Mike Rapoport's avatar Mike Rapoport Committed by Arnd Bergmann

char/agp: consolidate {alloc,free}_gatt_pages()

There is a copy of alloc_gatt_pages() and free_gatt_pages in several
architectures in arch/$ARCH/include/asm/agp.h. All the copies do exactly
the same: alias alloc_gatt_pages() to __get_free_pages(GFP_KERNEL) and
alias free_gatt_pages() to free_pages().

Define alloc_gatt_pages() and free_gatt_pages() in drivers/char/agp/agp.h
and drop per-architecture definitions.
Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 62465415
...@@ -10,10 +10,4 @@ ...@@ -10,10 +10,4 @@
#define unmap_page_from_agp(page) do { } while (0) #define unmap_page_from_agp(page) do { } while (0)
#define flush_agp_cache() mb() #define flush_agp_cache() mb()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif #endif
...@@ -18,10 +18,4 @@ ...@@ -18,10 +18,4 @@
#define unmap_page_from_agp(page) do { } while (0) #define unmap_page_from_agp(page) do { } while (0)
#define flush_agp_cache() mb() #define flush_agp_cache() mb()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif /* _ASM_IA64_AGP_H */ #endif /* _ASM_IA64_AGP_H */
...@@ -12,10 +12,4 @@ ...@@ -12,10 +12,4 @@
#define unmap_page_from_agp(page) do { } while (0) #define unmap_page_from_agp(page) do { } while (0)
#define flush_agp_cache() mb() #define flush_agp_cache() mb()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif /* _ASM_PARISC_AGP_H */ #endif /* _ASM_PARISC_AGP_H */
...@@ -9,11 +9,5 @@ ...@@ -9,11 +9,5 @@
#define unmap_page_from_agp(page) do {} while (0) #define unmap_page_from_agp(page) do {} while (0)
#define flush_agp_cache() mb() #define flush_agp_cache() mb()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_AGP_H */ #endif /* _ASM_POWERPC_AGP_H */
...@@ -8,10 +8,4 @@ ...@@ -8,10 +8,4 @@
#define unmap_page_from_agp(page) do { } while (0) #define unmap_page_from_agp(page) do { } while (0)
#define flush_agp_cache() mb() #define flush_agp_cache() mb()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif #endif
...@@ -23,10 +23,4 @@ ...@@ -23,10 +23,4 @@
*/ */
#define flush_agp_cache() wbinvd() #define flush_agp_cache() wbinvd()
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif /* _ASM_X86_AGP_H */ #endif /* _ASM_X86_AGP_H */
...@@ -236,6 +236,12 @@ void agp3_generic_tlbflush(struct agp_memory *mem); ...@@ -236,6 +236,12 @@ void agp3_generic_tlbflush(struct agp_memory *mem);
int agp3_generic_configure(void); int agp3_generic_configure(void);
void agp3_generic_cleanup(void); void agp3_generic_cleanup(void);
/* GATT allocation. Returns/accepts GATT kernel virtual address. */
#define alloc_gatt_pages(order) \
((char *)__get_free_pages(GFP_KERNEL, (order)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
/* aperture sizes have been standardised since v3 */ /* aperture sizes have been standardised since v3 */
#define AGP_GENERIC_SIZES_ENTRIES 11 #define AGP_GENERIC_SIZES_ENTRIES 11
extern const struct aper_size_info_16 agp3_generic_sizes[]; extern const struct aper_size_info_16 agp3_generic_sizes[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment