From f5844cea13ba330beaeebb171eca1580efba62c6 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Sat, 26 Apr 2003 21:33:44 +0000 Subject: 2.5.x sync patch from Linus Torvalds --- linux-core/drm_memory.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux-core/drm_memory.h') 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 #include "drmP.h" -#include /* 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); -- cgit v1.2.3