aboutsummaryrefslogtreecommitdiff
path: root/include/asm-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 17:38:16 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-04 17:38:16 -0700
commit98b96173c777c67daaa7d163a35e591e1928a164 (patch)
tree0530429db1328a00b89972ca67d15e1b61e66ba8 /include/asm-i386
parentcf8ba7a95511b86608acb481ad96219fe2da4b3a (diff)
parent881ba59d4685b28433bf313b6db51672a02696a3 (diff)
downloadlinux-2.6.34-ux500-98b96173c777c67daaa7d163a35e591e1928a164.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] sworks-agp: Switch to PCI ref counting APIs [AGPGART] Nvidia AGP: Use refcount aware PCI interfaces [AGPGART] Fix sparse warning in sgi-agp.c [AGPGART] Intel-agp adjustments [AGPGART] Move [un]map_page_into_agp into asm/agp.h [AGPGART] Add missing calls to global_flush_tlb() to ali-agp [AGPGART] prevent probe collision of sis-agp and amd64_agp
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/agp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h
index 9075083bab7..6af173dbf12 100644
--- a/include/asm-i386/agp.h
+++ b/include/asm-i386/agp.h
@@ -12,8 +12,10 @@
* data corruption on some CPUs.
*/
-int map_page_into_agp(struct page *page);
-int unmap_page_from_agp(struct page *page);
+/* Caller's responsibility to call global_flush_tlb() for
+ * performance reasons */
+#define map_page_into_agp(page) change_page_attr(page, 1, PAGE_KERNEL_NOCACHE)
+#define unmap_page_from_agp(page) change_page_attr(page, 1, PAGE_KERNEL)
#define flush_agp_mappings() global_flush_tlb()
/* Could use CLFLUSH here if the cpu supports it. But then it would