From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by kanga.kvack.org (Postfix) with ESMTP id 6780A6B0032 for ; Sat, 3 Jan 2015 11:04:45 -0500 (EST) Received: by mail-we0-f180.google.com with SMTP id w62so5757357wes.39 for ; Sat, 03 Jan 2015 08:04:45 -0800 (PST) Received: from mailrelay007.isp.belgacom.be (mailrelay007.isp.belgacom.be. [195.238.6.173]) by mx.google.com with ESMTP id r3si5289371wix.30.2015.01.03.08.04.44 for ; Sat, 03 Jan 2015 08:04:44 -0800 (PST) From: Fabian Frederick Subject: [PATCH 1/1 linux-next] mm,compaction: move suitable_migration_target() under CONFIG_COMPACTION Date: Sat, 3 Jan 2015 17:04:28 +0100 Message-Id: <1420301068-19447-1-git-send-email-fabf@skynet.be> Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , linux-mm@kvack.org suitable_migration_target() is only used by isolate_freepages() Define it under CONFIG_COMPACTION || CONFIG_CMA is not needed. Fix the following warning: mm/compaction.c:311:13: warning: 'suitable_migration_target' defined but not used [-Wunused-function] Signed-off-by: Fabian Frederick --- mm/compaction.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 546e571..38b151c 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -307,28 +307,6 @@ static inline bool compact_should_abort(struct compact_control *cc) return false; } -/* Returns true if the page is within a block suitable for migration to */ -static bool suitable_migration_target(struct page *page) -{ - /* If the page is a large free page, then disallow migration */ - if (PageBuddy(page)) { - /* - * We are checking page_order without zone->lock taken. But - * the only small danger is that we skip a potentially suitable - * pageblock, so it's not worth to check order for valid range. - */ - if (page_order_unsafe(page) >= pageblock_order) - return false; - } - - /* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */ - if (migrate_async_suitable(get_pageblock_migratetype(page))) - return true; - - /* Otherwise skip the block */ - return false; -} - /* * Isolate free pages onto a private freelist. If @strict is true, will abort * returning 0 on any invalid PFNs or non-free pages inside of the pageblock @@ -802,6 +780,28 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, #endif /* CONFIG_COMPACTION || CONFIG_CMA */ #ifdef CONFIG_COMPACTION +/* Returns true if the page is within a block suitable for migration to */ +static bool suitable_migration_target(struct page *page) +{ + /* If the page is a large free page, then disallow migration */ + if (PageBuddy(page)) { + /* + * We are checking page_order without zone->lock taken. But + * the only small danger is that we skip a potentially suitable + * pageblock, so it's not worth to check order for valid range. + */ + if (page_order_unsafe(page) >= pageblock_order) + return false; + } + + /* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */ + if (migrate_async_suitable(get_pageblock_migratetype(page))) + return true; + + /* Otherwise skip the block */ + return false; +} + /* * Based on information in the current compact_control, find blocks * suitable for isolating free pages from and then isolate them. -- 2.1.0 -- 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