linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2015-09-17T02:15:39Z

Hi Andrew,

After merging the akpm-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

mm/page_alloc.c:184:14: error: conflicting types for 'pageblock_order'
unsigned int pageblock_order __read_mostly;
^
In file included from include/linux/mmzone.h:17:0,
from include/linux/gfp.h:5,
from include/linux/mm.h:9,
from mm/page_alloc.c:18:
include/linux/pageblock-flags.h:47:12: note: previous declaration of 'pageblock_order' was here
extern int pageblock_order;
^

Caused by commit

b3c625d32a04 ("mm: use 'unsigned int' for page order")

I assume that this was never built with CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
set (or the hunk that updated include/linux/pageblock-flags.h was missed).

I have added the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Sep 2015 11:58:50 +1000
Subject: [PATCH] mm-use-unsigned-int-for-page-order-fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/pageblock-flags.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h
index 2baeee12f48e..e942558b3585 100644
--- a/include/linux/pageblock-flags.h
+++ b/include/linux/pageblock-flags.h
@@ -44,7 +44,7 @@ enum pageblock_bits {
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE

/* Huge page sizes are variable */
-extern int pageblock_order;
+extern unsigned int pageblock_order;

#else /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */

--
2.5.1

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au