Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932157AbVL3WmD (ORCPT ); Fri, 30 Dec 2005 17:42:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932165AbVL3Wln (ORCPT ); Fri, 30 Dec 2005 17:41:43 -0500 Received: from amsfep17-int.chello.nl ([213.46.243.15]:44350 "EHLO amsfep17-int.chello.nl") by vger.kernel.org with ESMTP id S932154AbVL3WlR (ORCPT ); Fri, 30 Dec 2005 17:41:17 -0500 From: Peter Zijlstra To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , Peter Zijlstra , Christoph Lameter , Wu Fengguang , Nick Piggin , Marijn Meijles , Rik van Riel , Marcelo Tosatti Message-Id: <20051230224052.765.81067.sendpatchset@twins.localnet> In-Reply-To: <20051230223952.765.21096.sendpatchset@twins.localnet> References: <20051230223952.765.21096.sendpatchset@twins.localnet> Subject: [PATCH 06/14] page-replace-move-macros.patch Date: Fri, 30 Dec 2005 23:41:14 +0100 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2732 Lines: 91 From: Peter Zijlstra Move some utility marco's to the new common header to they can be used by the code moved over to page_replace.c Signed-off-by: Peter Zijlstra --- linux-2.6-git.orig/include/linux/mm_page_replace.h 2005-12-10 20:50:44.000000000 +0100 +++ linux-2.6-git/include/linux/mm_page_replace.h 2005-12-10 20:53:12.000000000 +0100 @@ -6,6 +6,36 @@ #include #include +#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru)) + +#ifdef ARCH_HAS_PREFETCH +#define prefetch_prev_lru_page(_page, _base, _field) \ + do { \ + if ((_page)->lru.prev != _base) { \ + struct page *prev; \ + \ + prev = lru_to_page(&(_page->lru)); \ + prefetch(&prev->_field); \ + } \ + } while (0) +#else +#define prefetch_prev_lru_page(_page, _base, _field) do { } while (0) +#endif + +#ifdef ARCH_HAS_PREFETCHW +#define prefetchw_prev_lru_page(_page, _base, _field) \ + do { \ + if ((_page)->lru.prev != _base) { \ + struct page *prev; \ + \ + prev = lru_to_page(&(_page->lru)); \ + prefetchw(&prev->_field); \ + } \ + } while (0) +#else +#define prefetchw_prev_lru_page(_page, _base, _field) do { } while (0) +#endif + void __page_replace_insert(struct zone *, struct page *); static inline void page_replace_activate(struct page *page) { --- linux-2.6-git.orig/mm/vmscan.c 2005-12-10 20:50:44.000000000 +0100 +++ linux-2.6-git/mm/vmscan.c 2005-12-10 20:53:12.000000000 +0100 @@ -104,36 +104,6 @@ long nr; /* objs pending delete */ }; -#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru)) - -#ifdef ARCH_HAS_PREFETCH -#define prefetch_prev_lru_page(_page, _base, _field) \ - do { \ - if ((_page)->lru.prev != _base) { \ - struct page *prev; \ - \ - prev = lru_to_page(&(_page->lru)); \ - prefetch(&prev->_field); \ - } \ - } while (0) -#else -#define prefetch_prev_lru_page(_page, _base, _field) do { } while (0) -#endif - -#ifdef ARCH_HAS_PREFETCHW -#define prefetchw_prev_lru_page(_page, _base, _field) \ - do { \ - if ((_page)->lru.prev != _base) { \ - struct page *prev; \ - \ - prev = lru_to_page(&(_page->lru)); \ - prefetchw(&prev->_field); \ - } \ - } while (0) -#else -#define prefetchw_prev_lru_page(_page, _base, _field) do { } while (0) -#endif - /* * From 0 .. 100. Higher means more swappy. */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/