From 83bc49d051ab7b13365f9865ae57d337313101a2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 6 May 2010 13:42:24 +0000 Subject: [PATCH] vm_page_requeue(): Disabled DEBUG_PAGE_ACCESS_CHECK(). Since r36155 idle_scan_active_pages() cannot satisfy this assertion anymore. Added TODO for a better fix which can wait until after the release. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36649 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/vm/vm_page.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp index 6ac036134d..ef31a9d1d1 100644 --- a/src/system/kernel/vm/vm_page.cpp +++ b/src/system/kernel/vm/vm_page.cpp @@ -3441,7 +3441,14 @@ void vm_page_requeue(struct vm_page *page, bool tail) { PAGE_ASSERT(page, page->Cache() != NULL); - DEBUG_PAGE_ACCESS_CHECK(page); + page->Cache()->AssertLocked(); + // DEBUG_PAGE_ACCESS_CHECK(page); + // TODO: This assertion cannot be satisfied by idle_scan_active_pages() + // when it requeues busy pages. The reason is that vm_soft_fault() + // (respectively fault_get_page()) and the file cache keep newly + // allocated pages accessed while they are reading them from disk. It + // would probably be better to change that code and reenable this + // check. VMPageQueue *queue = NULL;