Commit-ID: 75dd655399e0f79e325becaef4320407a8a6439b Gitweb: http://git.kernel.org/tip/75dd655399e0f79e325becaef4320407a8a6439b Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Mon, 3 Dec 2012 12:00:08 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Mon, 3 Dec 2012 12:02:00 +0100 mm/migrate: Don't expose migrate_misplaced_transhuge_page_put() on !CONFIG_TRANSPARENT_HUGEPAGES The migrate_misplaced_transhuge_page_put() function does not have to be exposed on !CONFIG_TRANSPARENT_HUGEPAGES - and it also won't build: mm/migrate.c:1549:34: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed mm/migrate.c:1564:49: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed mm/migrate.c:1566:35: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed mm/migrate.c:1573:35: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed make[1]: *** [mm/migrate.o] Error 1 Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- mm/migrate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/migrate.c b/mm/migrate.c index 1583b74..14202e7 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1540,6 +1540,7 @@ out: return isolated; } +# ifdef CONFIG_TRANSPARENT_HUGEPAGE int migrate_misplaced_transhuge_page_put(struct mm_struct *mm, struct vm_area_struct *vma, pmd_t *pmd, pmd_t entry, @@ -1653,6 +1654,8 @@ out_dropref: out_keep_locked: return 0; } +# endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + #endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_NUMA */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|