From 805c72aae55787a7fff54b664af1612fa631415b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 29 May 2012 15:06:44 -0700 Subject: [PATCH] --- yaml --- r: 308879 b: refs/heads/master c: 51300cef41c9355a7d428fe0714888d3c72a6f2f h: refs/heads/master i: 308877: cdee434f0d720764e1bdef16c369271421692644 308875: 70a7a7825660d906f95a394b72f0e82f68d4383a 308871: fad25400e1c3a191554e07bf7503cd062a234398 308863: 60a4fa2b5765e7100a062fbc3c91a5bb611eadc9 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 48ac4dd311ea..5e065c1ace91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acc50c110cf6f1a8bd1af410b2c7bc29ca624678 +refs/heads/master: 51300cef41c9355a7d428fe0714888d3c72a6f2f diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 5712898c951b..4fc462b5fcf1 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -5938,7 +5938,7 @@ bool is_free_buddy_page(struct page *page) } #endif -static struct trace_print_flags pageflag_names[] = { +static const struct trace_print_flags pageflag_names[] = { {1UL << PG_locked, "locked" }, {1UL << PG_error, "error" }, {1UL << PG_referenced, "referenced" }, @@ -5976,7 +5976,6 @@ static struct trace_print_flags pageflag_names[] = { #ifdef CONFIG_TRANSPARENT_HUGEPAGE {1UL << PG_compound_lock, "compound_lock" }, #endif - {-1UL, NULL }, }; static void dump_page_flags(unsigned long flags) @@ -5985,14 +5984,14 @@ static void dump_page_flags(unsigned long flags) unsigned long mask; int i; - BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) - 1 != __NR_PAGEFLAGS); + BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS); printk(KERN_ALERT "page flags: %#lx(", flags); /* remove zone id */ flags &= (1UL << NR_PAGEFLAGS) - 1; - for (i = 0; pageflag_names[i].name && flags; i++) { + for (i = 0; i < ARRAY_SIZE(pageflag_names) && flags; i++) { mask = pageflag_names[i].mask; if ((flags & mask) != mask)