diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-i386/agp.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/agp.h')
| -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 |