diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:38:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:38:16 -0400 |
commit | 98b96173c777c67daaa7d163a35e591e1928a164 (patch) | |
tree | 0530429db1328a00b89972ca67d15e1b61e66ba8 /include/asm-i386 | |
parent | cf8ba7a95511b86608acb481ad96219fe2da4b3a (diff) | |
parent | 881ba59d4685b28433bf313b6db51672a02696a3 (diff) |
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.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h index 9075083bab76..6af173dbf123 100644 --- a/include/asm-i386/agp.h +++ b/include/asm-i386/agp.h | |||
@@ -12,8 +12,10 @@ | |||
12 | * data corruption on some CPUs. | 12 | * data corruption on some CPUs. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | int map_page_into_agp(struct page *page); | 15 | /* Caller's responsibility to call global_flush_tlb() for |
16 | int unmap_page_from_agp(struct page *page); | 16 | * performance reasons */ |
17 | #define map_page_into_agp(page) change_page_attr(page, 1, PAGE_KERNEL_NOCACHE) | ||
18 | #define unmap_page_from_agp(page) change_page_attr(page, 1, PAGE_KERNEL) | ||
17 | #define flush_agp_mappings() global_flush_tlb() | 19 | #define flush_agp_mappings() global_flush_tlb() |
18 | 20 | ||
19 | /* Could use CLFLUSH here if the cpu supports it. But then it would | 21 | /* Could use CLFLUSH here if the cpu supports it. But then it would |