diff for duplicates of <5656E14A.1020508@suse.cz> diff --git a/a/1.txt b/N1/1.txt index 6b45f6f..343151b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,3 +21,75 @@ migrate_reason is defined regardless of CONFIG_MIGRATION, so match that for migrate_reason_names as well. ------8<------ +>From 7b650fd613ed382aaa6f11f4b779e883a6af10aa Mon Sep 17 00:00:00 2001 +From: Vlastimil Babka <vbabka@suse.cz> +Date: Thu, 26 Nov 2015 11:31:09 +0100 +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. + +--- + include/linux/migrate.h | 2 +- + mm/debug.c | 11 +++++++++++ + mm/migrate.c | 10 ---------- + 3 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/include/linux/migrate.h b/include/linux/migrate.h +index ab92a8cf4c93..8fdc033e527a 100644 +--- a/include/linux/migrate.h ++++ b/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 --git a/mm/debug.c b/mm/debug.c +index d9718fc8377a..a4cd0c093ff6 100644 +--- a/mm/debug.c ++++ b/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 --git a/mm/migrate.c b/mm/migrate.c +index 12e9ab9de446..1c11b73cd834 100644 +--- a/mm/migrate.c ++++ b/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 +-- +2.6.3 diff --git a/a/content_digest b/N1/content_digest index 67e4c96..5879f3b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -37,6 +37,78 @@ "migrate_reason is defined regardless of CONFIG_MIGRATION, so match that\n" "for migrate_reason_names as well.\n" "\n" - ------8<------ + "------8<------\n" + ">From 7b650fd613ed382aaa6f11f4b779e883a6af10aa Mon Sep 17 00:00:00 2001\n" + "From: Vlastimil Babka <vbabka@suse.cz>\n" + "Date: Thu, 26 Nov 2015 11:31:09 +0100\n" + "Subject: mm, page_owner: track and print last migrate reason-fix\n" + "\n" + "Move migrate_reason_names from mm/migrate.c to mm/debug.c so that link doesn't\n" + "warn with CONFIG_MIGRATION disabled.\n" + "\n" + "---\n" + " include/linux/migrate.h | 2 +-\n" + " mm/debug.c | 11 +++++++++++\n" + " mm/migrate.c | 10 ----------\n" + " 3 files changed, 12 insertions(+), 11 deletions(-)\n" + "\n" + "diff --git a/include/linux/migrate.h b/include/linux/migrate.h\n" + "index ab92a8cf4c93..8fdc033e527a 100644\n" + "--- a/include/linux/migrate.h\n" + "+++ b/include/linux/migrate.h\n" + "@@ -27,7 +27,7 @@ enum migrate_reason {\n" + " \tMR_TYPES\n" + " };\n" + " \n" + "-/* In mm/migrate.c; also keep sync with include/trace/events/migrate.h */\n" + "+/* In mm/debug.c; also keep sync with include/trace/events/migrate.h */\n" + " extern char * migrate_reason_names[MR_TYPES];\n" + " \n" + " #ifdef CONFIG_MIGRATION\n" + "diff --git a/mm/debug.c b/mm/debug.c\n" + "index d9718fc8377a..a4cd0c093ff6 100644\n" + "--- a/mm/debug.c\n" + "+++ b/mm/debug.c\n" + "@@ -9,6 +9,17 @@\n" + " #include <linux/mm.h>\n" + " #include <linux/trace_events.h>\n" + " #include <linux/memcontrol.h>\n" + "+#include <linux/migrate.h>\n" + "+\n" + "+char *migrate_reason_names[MR_TYPES] = {\n" + "+\t\"compaction\",\n" + "+\t\"memory_failure\",\n" + "+\t\"memory_hotplug\",\n" + "+\t\"syscall_or_cpuset\",\n" + "+\t\"mempolicy_mbind\",\n" + "+\t\"numa_misplaced\",\n" + "+\t\"cma\",\n" + "+};\n" + " \n" + " static const struct trace_print_flags pageflag_names[] = {\n" + " \t{1UL << PG_locked,\t\t\"locked\"\t},\n" + "diff --git a/mm/migrate.c b/mm/migrate.c\n" + "index 12e9ab9de446..1c11b73cd834 100644\n" + "--- a/mm/migrate.c\n" + "+++ b/mm/migrate.c\n" + "@@ -47,16 +47,6 @@\n" + " \n" + " #include \"internal.h\"\n" + " \n" + "-char *migrate_reason_names[MR_TYPES] = {\n" + "-\t\"compaction\",\n" + "-\t\"memory_failure\",\n" + "-\t\"memory_hotplug\",\n" + "-\t\"syscall_or_cpuset\",\n" + "-\t\"mempolicy_mbind\",\n" + "-\t\"numa_misplaced\",\n" + "-\t\"cma\",\n" + "-};\n" + "-\n" + " /*\n" + " * migrate_prep() needs to be called before we start compiling a list of pages\n" + " * to be migrated using isolate_lru_page(). If scheduling work on other CPUs is\n" + "-- \n" + 2.6.3 -e7c8b133f3a1b8a5d592462e78cafe73d60368ab27988f5e380c2c7b9201bc23 +233da9a59354ba8200d757da26701724776811b0c53af3ef9e582c0dfe9af3d4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.