Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Mike Rapoport and committed by
Arnd Bergmann
0e4f2c45 62465415

+6 -36
-6
arch/alpha/include/asm/agp.h
··· 10 10 #define unmap_page_from_agp(page) do { } while (0) 11 11 #define flush_agp_cache() mb() 12 12 13 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 14 - #define alloc_gatt_pages(order) \ 15 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 16 - #define free_gatt_pages(table, order) \ 17 - free_pages((unsigned long)(table), (order)) 18 - 19 13 #endif
-6
arch/ia64/include/asm/agp.h
··· 18 18 #define unmap_page_from_agp(page) do { } while (0) 19 19 #define flush_agp_cache() mb() 20 20 21 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 22 - #define alloc_gatt_pages(order) \ 23 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 24 - #define free_gatt_pages(table, order) \ 25 - free_pages((unsigned long)(table), (order)) 26 - 27 21 #endif /* _ASM_IA64_AGP_H */
-6
arch/parisc/include/asm/agp.h
··· 12 12 #define unmap_page_from_agp(page) do { } while (0) 13 13 #define flush_agp_cache() mb() 14 14 15 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 16 - #define alloc_gatt_pages(order) \ 17 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 18 - #define free_gatt_pages(table, order) \ 19 - free_pages((unsigned long)(table), (order)) 20 - 21 15 #endif /* _ASM_PARISC_AGP_H */
-6
arch/powerpc/include/asm/agp.h
··· 9 9 #define unmap_page_from_agp(page) do {} while (0) 10 10 #define flush_agp_cache() mb() 11 11 12 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 13 - #define alloc_gatt_pages(order) \ 14 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 15 - #define free_gatt_pages(table, order) \ 16 - free_pages((unsigned long)(table), (order)) 17 - 18 12 #endif /* __KERNEL__ */ 19 13 #endif /* _ASM_POWERPC_AGP_H */
-6
arch/sparc/include/asm/agp.h
··· 8 8 #define unmap_page_from_agp(page) do { } while (0) 9 9 #define flush_agp_cache() mb() 10 10 11 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 12 - #define alloc_gatt_pages(order) \ 13 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 14 - #define free_gatt_pages(table, order) \ 15 - free_pages((unsigned long)(table), (order)) 16 - 17 11 #endif
-6
arch/x86/include/asm/agp.h
··· 23 23 */ 24 24 #define flush_agp_cache() wbinvd() 25 25 26 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 27 - #define alloc_gatt_pages(order) \ 28 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 29 - #define free_gatt_pages(table, order) \ 30 - free_pages((unsigned long)(table), (order)) 31 - 32 26 #endif /* _ASM_X86_AGP_H */
+6
drivers/char/agp/agp.h
··· 236 236 int agp3_generic_configure(void); 237 237 void agp3_generic_cleanup(void); 238 238 239 + /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 240 + #define alloc_gatt_pages(order) \ 241 + ((char *)__get_free_pages(GFP_KERNEL, (order))) 242 + #define free_gatt_pages(table, order) \ 243 + free_pages((unsigned long)(table), (order)) 244 + 239 245 /* aperture sizes have been standardised since v3 */ 240 246 #define AGP_GENERIC_SIZES_ENTRIES 11 241 247 extern const struct aper_size_info_16 agp3_generic_sizes[];