From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753402AbcEBIcp (ORCPT ); Mon, 2 May 2016 04:32:45 -0400 Received: from ozlabs.org ([103.22.144.67]:42674 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386AbcEBIch (ORCPT ); Mon, 2 May 2016 04:32:37 -0400 Date: Mon, 2 May 2016 18:32:34 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ebru Akagunduz , Rik van Riel , "Aneesh Kumar K.V" Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20160502183234.1dad8115@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, After merging the akpm-current tree, today's linux-next build (powerpc allyesconfig and pseries_le_defconfig) failed like this: In file included from include/linux/mm.h:394:0, from mm/huge_memory.c:10: include/linux/huge_mm.h:53:22: error: initializer element is not constant #define HPAGE_PMD_NR (1< Date: Mon, 2 May 2016 18:25:42 +1000 Subject: [PATCH] mm: make optimistic check for swapin readahead fix Signed-off-by: Stephen Rothwell --- mm/huge_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f0cd9dbc1157..6aabfa166b6d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -101,7 +101,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khugepaged_wait); * fault. */ static unsigned int khugepaged_max_ptes_none __read_mostly; -static unsigned int khugepaged_max_ptes_swap __read_mostly = HPAGE_PMD_NR/8; +static unsigned int khugepaged_max_ptes_swap __read_mostly; static unsigned long allocstall; static int khugepaged(void *none); @@ -703,6 +703,7 @@ static int __init hugepage_init(void) khugepaged_pages_to_scan = HPAGE_PMD_NR * 8; khugepaged_max_ptes_none = HPAGE_PMD_NR - 1; + khugepaged_max_ptes_swap = HPAGE_PMD_NR / 8; /* * hugepages can't be allocated by the buddy allocator */ -- 2.7.0 -- Cheers, Stephen Rothwell