diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2003-04-26 21:33:44 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-04-26 21:33:44 +0000 |
| commit | f5844cea13ba330beaeebb171eca1580efba62c6 (patch) | |
| tree | a6f82faac5c75bee44e39e7bb4eda0048849b59a /linux-core/drm_memory.h | |
| parent | 2c40a56393102bb0fb21e183bf5a08b0eea35c57 (diff) | |
2.5.x sync patch from Linus Torvalds
Diffstat (limited to 'linux-core/drm_memory.h')
| -rw-r--r-- | linux-core/drm_memory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h index b5a01749..ae5737f1 100644 --- a/linux-core/drm_memory.h +++ b/linux-core/drm_memory.h @@ -32,7 +32,6 @@ #define __NO_VERSION__ #include <linux/config.h> #include "drmP.h" -#include <linux/wrapper.h> /* Cut down version of drm_memory_debug.h, which used to be called * drm_memory.h. If you want the debug functionality, change 0 to 1 @@ -95,7 +94,7 @@ unsigned long DRM(alloc_pages)(int order, int area) for (addr = address, sz = bytes; sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { - mem_map_reserve(virt_to_page(addr)); + SetPageReserved(virt_to_page(addr)); } return address; @@ -114,7 +113,7 @@ void DRM(free_pages)(unsigned long address, int order, int area) for (addr = address, sz = bytes; sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { - mem_map_unreserve(virt_to_page(addr)); + ClearPageReserved(virt_to_page(addr)); } free_pages(address, order); |