mm: Fix build with CMA && !CONFIG_COMPACTION
Subsystems (2)
PATCH 1/1 mm: Fix build with CMA && !CONFIG_COMPACTION
In -next 20120926 "mm: compaction: cache if a pageblock was scanned and no pages were isolated" adds pageblock skipping operations used when CMA is enabled but only provides them if CONFIG_COMPACTION is defined, breaking the build. Fix this by also providing them when only CONFIG_CMA is enabled.
--- include/linux/pageblock-flags.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/pageblock-flags.h +4 -4
@@ -30,9 +30,9 @@ enum pageblock_bits { PB_migrate, PB_migrate_end = PB_migrate + 3 - 1,/* 3 bits required for migrate types */ -#ifdef CONFIG_COMPACTION +#if defined(CONFIG_COMPACTION ) || defined(CONFIG_CMA ) PB_migrate_skip,/* If set the block is skipped by compaction */ -#endif /* CONFIG_COMPACTION */ +#endif /* CONFIG_COMPACTION || CONFIG_CMA */NR_PAGEBLOCK_BITS };
@@ -68,7 +68,7 @@ unsigned long get_pageblock_flags_group(struct page *page,void set_pageblock_flags_group (struct page *page,unsigned long flags,int start_bitidx,int end_bitidx); -#ifdef CONFIG_COMPACTION +#if defined(CONFIG_COMPACTION ) || defined(CONFIG_CMA )#define get_pageblock_skip (page) \ get_pageblock_flags_group(page, PB_migrate_skip, \ PB_migrate_skip + 1)
@@ -78,7 +78,7 @@ void set_pageblock_flags_group(struct page *page, unsigned long flags,#define set_pageblock_skip (page) \ set_pageblock_flags_group(page, 1, PB_migrate_skip, \ PB_migrate_skip + 1) -#endif /* CONFIG_COMPACTION */ +#endif /* CONFIG_COMPACTION || CONFIG_CMA */ #define get_pageblock_flags (page) \ get_pageblock_flags_group(page, 0, PB_migrate_end)
Signature · 1 line
1.7.10.4
Quoted 6 lines · Mark Brown
In -next 20120926 "mm: compaction: cache if a pageblock was scanned and no pages were isolated" adds pageblock skipping operations used when CMA is enabled but only provides them if
CONFIG_COMPACTIONis defined, breaking the build. Fix this by also providing them when onlyCONFIG_CMAis enabled.Signed-off-by Mark Brown <[email protected]>
Thanks but I've already pushed an alternative patch towards Andrew for this particular build problem. The patch explains why the fix is different.
---8<---
mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix
Fengguang Wu reported the following
tree: git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git since-3.5 head: 2f641f902ca76711e47e8d3b18004f0e46ca3d9b commit: 7faeb2a39c789f1bac69014cc468677a60b73395 [184/186] mm: compaction: cache if a pageblock was scanned and no pages were isolated config: i386-randconfig-b083 (attached as .config)
All error/warnings:
mm/compaction.c: In function 'isolation_suitable':mm/compaction.c:60:2: error: implicit declaration of function 'get_pageblock_skip' [-Werror=implicit-function-declaration] mm/compaction.c: In function 'reset_isolation_suitable':mm/compaction.c:94:3: error: implicit declaration of function 'clear_pageblock_skip' [-Werror=implicit-function-declaration] mm/compaction.c: In function 'update_pageblock_skip':mm/compaction.c:108:3: error: implicit declaration of function 'set_pageblock_skip' [-Werror=implicit-function-declaration] mm/compaction.c: At top level:mm/compaction.c:68:13: warning: 'reset_isolation_suitable' defined but not used [-Wunused-function] mm/compaction.c:177:13: warning: 'compact_capture_page' defined but not used [-Wunused-function]
cc1: some warnings being treated as errors
Michal Hocko suggested implementing !CONFIG_COMPACTION versions of these functions but that still leaves the dead version of reset_isolation_suitable in the !CONFIG_COMPACTION && CONFIG_CMA case. Create !CONFIG_COMPACTION versions of isolation_suitable() and update_pageblock_skip() instead.
This is a fix for mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated.patch
--- mm/compaction.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
mm/compaction.c +12 -0
@@ -50,6 +50,7 @@ static inline bool migrate_async_suitable(int migratetype)return is_migrate_cma (migratetype) || migratetype ==MIGRATE_MOVABLE ; } +#ifdef CONFIG_COMPACTION /* Returns true if the pageblock should be scanned for pages to isolate. */ static inline bool isolation_suitable (struct compact_control *cc,struct page *page)
@@ -107,6 +108,17 @@ static void update_pageblock_skip(struct page *page, unsigned long nr_isolated)if (!nr_isolated) set_pageblock_skip(page); } +#else +static inline bool isolation_suitable (struct compact_control *cc, +struct page *page) +{ +return true; +} + +static void update_pageblock_skip (struct page *page,unsigned long nr_isolated) +{ +} +#endif /* CONFIG_COMPACTION */ static inline bool should_release_lock (spinlock_t *lock) {