The patch titled Subject: mm, page_owner: track and print last migrate reason-fix has been added to the -mm tree. Its filename is mm-page_owner-track-and-print-last-migrate-reason-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-page_owner-track-and-print-last-migrate-reason-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-page_owner-track-and-print-last-migrate-reason-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Vlastimil Babka <vbabka@xxxxxxx> Subject: mm, page_owner: track and print last migrate reason-fix Move migrate_reason_names from mm/migrate.c to mm/debug.c so that link doesn't warn with CONFIG_MIGRATION disabled. Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/migrate.h | 2 +- mm/debug.c | 11 +++++++++++ mm/migrate.c | 10 ---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff -puN include/linux/migrate.h~mm-page_owner-track-and-print-last-migrate-reason-fix include/linux/migrate.h --- a/include/linux/migrate.h~mm-page_owner-track-and-print-last-migrate-reason-fix +++ a/include/linux/migrate.h @@ -27,7 +27,7 @@ enum migrate_reason { MR_TYPES }; -/* In mm/migrate.c; also keep sync with include/trace/events/migrate.h */ +/* In mm/debug.c; also keep sync with include/trace/events/migrate.h */ extern char * migrate_reason_names[MR_TYPES]; #ifdef CONFIG_MIGRATION diff -puN mm/debug.c~mm-page_owner-track-and-print-last-migrate-reason-fix mm/debug.c --- a/mm/debug.c~mm-page_owner-track-and-print-last-migrate-reason-fix +++ a/mm/debug.c @@ -9,6 +9,17 @@ #include <linux/mm.h> #include <linux/trace_events.h> #include <linux/memcontrol.h> +#include <linux/migrate.h> + +char *migrate_reason_names[MR_TYPES] = { + "compaction", + "memory_failure", + "memory_hotplug", + "syscall_or_cpuset", + "mempolicy_mbind", + "numa_misplaced", + "cma", +}; static const struct trace_print_flags pageflag_names[] = { {1UL << PG_locked, "locked" }, diff -puN mm/migrate.c~mm-page_owner-track-and-print-last-migrate-reason-fix mm/migrate.c --- a/mm/migrate.c~mm-page_owner-track-and-print-last-migrate-reason-fix +++ a/mm/migrate.c @@ -47,16 +47,6 @@ #include "internal.h" -char *migrate_reason_names[MR_TYPES] = { - "compaction", - "memory_failure", - "memory_hotplug", - "syscall_or_cpuset", - "mempolicy_mbind", - "numa_misplaced", - "cma", -}; - /* * migrate_prep() needs to be called before we start compiling a list of pages * to be migrated using isolate_lru_page(). If scheduling work on other CPUs is _ Patches currently in -mm which might be from vbabka@xxxxxxx are mm-fix-swapped-movable-and-reclaimable-in-proc-pagetypeinfo.patch mm-documentation-clarify-proc-pid-status-vmswap-limitations-for-shmem.patch mm-proc-account-for-shmem-swap-in-proc-pid-smaps.patch mm-proc-reduce-cost-of-proc-pid-smaps-for-shmem-mappings.patch mm-proc-reduce-cost-of-proc-pid-smaps-for-unpopulated-shmem-mappings.patch mm-debug-fix-wrongly-filtered-flags-in-dump_vma.patch mm-page_owner-print-symbolic-migratetype-of-both-page-and-pageblock.patch mm-page_owner-convert-page_owner_inited-to-static-key.patch mm-page_owner-copy-page-owner-info-during-migration.patch mm-page_owner-track-and-print-last-migrate-reason.patch mm-page_owner-track-and-print-last-migrate-reason-fix.patch mm-debug-introduce-dump_gfpflag_names-for-symbolic-printing-of-gfp_flags.patch mm-page_owner-dump-page-owner-info-from-dump_page.patch mm-page_alloc-print-symbolic-gfp_flags-on-allocation-failure.patch mm-oom-print-symbolic-gfp_flags-in-oom-warning.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html