From patchwork Mon May 2 08:32:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 617416 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qyyJQ3vcQz9sDX for ; Mon, 2 May 2016 18:33:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=h1zZcAZm; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3qyyJQ2krvzDqHd for ; Mon, 2 May 2016 18:33:58 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=h1zZcAZm; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3qyyGq445WzDqCT for ; Mon, 2 May 2016 18:32:35 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=h1zZcAZm; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3qyyGq0vZbz9t6Z; Mon, 2 May 2016 18:32:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1462177955; bh=9kvVqQKouWXdlC6fcjGqGMuHFtM0Ki0VIWH0CBTNsqo=; h=Date:From:To:Cc:Subject:From; b=h1zZcAZmIZUWFvDp2Ur94gt2o0DCioaozJbDsg7s8mdKcC+aIKDge74VjD4P3XK6o FKEnnMrf9fY2wQFTQhgoAnzP8Mu4R5n2Mpv0vSzXJOBUTq6gRle/mzRDdVB3ZlNk6/ L+/YNODT9D/Io+RSJ3NkOaYV97UwshOtjY0051uU= Date: Mon, 2 May 2016 18:32:34 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , Benjamin Herrenschmidt , Subject: linux-next: build failure after merge of the akpm-current tree Message-ID: <20160502183234.1dad8115@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Aneesh Kumar K.V" , Rik van Riel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ebru Akagunduz Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 Reviewed-by: Aneesh Kumar K.V --- 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 */