From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail138.messagelabs.com (mail138.messagelabs.com [216.82.249.35]) by kanga.kvack.org (Postfix) with ESMTP id 879E76B004D for ; Sun, 22 Mar 2009 15:24:43 -0400 (EDT) From: Johannes Weiner Subject: [patch 1/3] mm: decouple unevictable lru from mmu Date: Sun, 22 Mar 2009 21:13:02 +0100 Message-Id: <1237752784-1989-1-git-send-email-hannes@cmpxchg.org> In-Reply-To: <20090321102044.GA3427@cmpxchg.org> References: <20090321102044.GA3427@cmpxchg.org> Sender: owner-linux-mm@kvack.org To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, David Howells , Nick Piggin , KOSAKI Motohiro , Rik van Riel , Peter Zijlstra , MinChan Kim , Lee Schermerhorn List-ID: Mlock is only one source of unevictable pages but with the unevictable lru enabled, mlock code is referenced unconditionally. Decouple the two so that the unevictable lru can work without mlock and thus on nommu setups where we still have unevictable pages from e.g. ramfs. Signed-off-by: Johannes Weiner Cc: David Howells Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Rik van Riel Cc: Peter Zijlstra Cc: MinChan Kim Cc: Lee Schermerhorn --- mm/Kconfig | 1 - mm/internal.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index a5b7781..fbb190e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -206,7 +206,6 @@ config VIRT_TO_BUS config UNEVICTABLE_LRU bool "Add LRU list to track non-evictable pages" default y - depends on MMU help Keeps unevictable pages off of the active and inactive pageout lists, so kswapd will not waste CPU time or have its balancing diff --git a/mm/internal.h b/mm/internal.h index 478223b..ceaa629 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -90,7 +90,7 @@ static inline void unevictable_migrate_page(struct page *new, struct page *old) } #endif -#ifdef CONFIG_UNEVICTABLE_LRU +#if defined(CONFIG_UNEVICTABLE_LRU) && defined(CONFIG_MMU) /* * Called only in fault path via page_evictable() for a new page * to determine if it's being mapped into a LOCKED vma. @@ -165,7 +165,7 @@ static inline void free_page_mlock(struct page *page) } } -#else /* CONFIG_UNEVICTABLE_LRU */ +#else /* CONFIG_UNEVICTABLE_LRU && CONFIG_MMU */ static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p) { return 0; -- 1.6.2.1.135.gde769 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org