mm, page_owner: only track migration if enabled

PATCH In review Arnd Bergmann 2 participants 2 messages Nov 27, 2015

Subsystems (2)

Memory management Page allocator

lore

Share & tools

lore

Arnd Bergmann

author

2015-11-27 13:58 UTC #0 lore raw

PATCH 1/1 mm, page_owner: only track migration if enabled

The newly added code to print page ownership in dump_page fails to link when CONFIG_MIGRATION is disabled:

mm/built-in.o: In function `print_page_owner':
frame_vector.c:(.text+0x72358): undefined reference to `migrate_reason_names'

This changes the two users of migrate_reason_names to first check CONFIG_MIGRATION, which avoids the error.

Signed-off-by Arnd Bergmann <[email protected]>

Fixes cf7ec391dae4 ("mm, page_owner: dump page owner info from dump_page()")

---
Found on yesterday's linux-next with ARM randconfig builds. The patch that introduced this is currently in Andrews tree.

If you don't already have a fix, please apply this one on top, or fold it into the original commit.

mm/page_owner.c +4 -2

index a81cfa0c13c3..4033542c3f5a 100644
@@ -170,7 +170,8 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
 	if (ret >= count)
 		goto err;
 
-	if (page_ext->last_migrate_reason != -1) {
+	if (IS_ENABLED(CONFIG_MIGRATION) &&
+	    page_ext->last_migrate_reason != -1) {
 		ret += snprintf(kbuf + ret, count - ret,
 			"Page has been migrated, last migrate reason: %s\n",
 			migrate_reason_names[page_ext->last_migrate_reason]);

@@ -213,7 +214,8 @@ void __dump_page_owner(struct page *page)
 	dump_gfpflag_names(gfp_mask);
 	print_stack_trace(&trace, 0);
 
-	if (page_ext->last_migrate_reason != -1)
+	if (IS_ENABLED(CONFIG_MIGRATION) &&
+	    page_ext->last_migrate_reason != -1)
 		pr_alert("page has been migrated, last migrate reason: %s\n",
 			migrate_reason_names[page_ext->last_migrate_reason]);
 }

Vlastimil Babka

2015-11-27 14:06 UTC #1 lore raw

Quoted 9 lines · Arnd Bergmann

The newly added code to print page ownership in dump_page fails to link when CONFIG_MIGRATION is disabled:
mm/built-in.o: In function `print_page_owner':
frame_vector.c:(.text+0x72358): undefined reference to `migrate_reason_names'
This changes the two users of migrate_reason_names to first check CONFIG_MIGRATION, which avoids the error.

Quoted 8 lines

Signed-off-by Arnd Bergmann <[email protected]>
Fixes cf7ec391dae4 ("mm, page_owner: dump page owner info from dump_page()")
---
Found on yesterday's linux-next with ARM randconfig builds. The patch that introduced this is currently in Andrews tree.
If you don't already have a fix, please apply this one on top, or fold it into the original commit.

Thanks. I posted a different one yesterday:
http://marc.info/?l=linux-mm&m=144853435200591&w=2