Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp234615ybz; Wed, 15 Apr 2020 07:48:37 -0700 (PDT) X-Google-Smtp-Source: APiQypImfVYm8UrFgMHBQdUphxZ8HRsnR28OpcJLOoFCIHl3luFwEqrfnHebTghtSX8OyUIrh3ea X-Received: by 2002:a50:d24c:: with SMTP id o12mr25239781edg.219.1586962117733; Wed, 15 Apr 2020 07:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586962117; cv=none; d=google.com; s=arc-20160816; b=uxXZLInPLrRCOeb05SO/2x1RUN0ltS+Bexr7gQcdET3T0wH2eadnOXjUIhRE2+TE7C jJNhu8vDWPrRUUzLkW42Ef1Sn5U3v/7sSItfVCiWgYuEe02SbKUePbVjVMF4xxLBVJab zRkCPoRPZwaTWED0KXIRcVJtBqQXUWyLLjmWIdejitQm2rwZ+ZwrFGY8QiZUDnH3Ta3+ 7DGTn1QSqQNr51zdWYbCCPpsMqAK2EDdLJTZXnlVWXH16SyFbye3CIeQmesotJmYYGkr yxlV2doVdfTSwoHiIZ27YxFi90/wIthj/wDhwy6F/FkEwGj6U7eprl1WoEHKD3SrJcI6 tojQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=ifyd/EF4IDnoRsp4uBMwu3Xs2IKDZXL7y51jG+ht3Zw=; b=Mvx++i7NeY27djBH5djYh+MUNCIQufAhiF2ucIXD+HTWGVwxb0MZqO85YoMXzL1d0D fWuxLLfPoQj6s6v+rMrHwbrCqiX4MWdd+LnfORJ6hiYXYJbkJGGVytuZK5C3Q2u/zT3X fwkK84/31xbwrTadR2Oc8/Ew7YOPpAEZTLjCWdDoP9yuJrn6yBvPEneNHbL1jWFw6jRt pHcoXt7nWrhJ6HberhAETrT2BQs5dhxhDPlc8ipQ2uWSAHXhTE+XX54eJN6y4qtqNCRi wY6E82LxaPRcOJ7em7vfONliHyv7wamkVsU/cAu9llL9v07EPYHIZ0gBjH8JtaTAuhs9 LXPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JZfORDVr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s25si10123763edw.441.2020.04.15.07.48.13; Wed, 15 Apr 2020 07:48:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JZfORDVr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392543AbgDOBZh (ORCPT + 99 others); Tue, 14 Apr 2020 21:25:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:55006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387762AbgDOBYd (ORCPT ); Tue, 14 Apr 2020 21:24:33 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC0E320784; Wed, 15 Apr 2020 01:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586913871; bh=Jttip+q2gFr6gM6I9moyxzeHwN0fQYq8HT40g3rs6lY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=JZfORDVrzKDLJirpGb9+s3ZEwYKVe+1aQi9jJl2B4EpQVaHqvSofy1OkreFy5zrFl RCxeBGgCWqZFUHLEM0eGRWY/W9G0TMmU5gAJWZ6tiYxOQUeBw7pp/0bYOUsSQpOxzD G3UkU16EORnqkD1GE3SmIGEbCJt+D/foJ5zsK4hw= Date: Tue, 14 Apr 2020 18:24:30 -0700 From: Andrew Morton To: Randy Dunlap Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Linux MM , Hugh Dickins Subject: Re: linux-next: Tree for Apr 14 (mm/shmem.c) Message-Id: <20200414182430.c5af29ddb1735f5fd0083983@linux-foundation.org> In-Reply-To: <200c608a-8159-18ce-b44e-cad2022e23e2@infradead.org> References: <20200414123900.4f97a83f@canb.auug.org.au> <200c608a-8159-18ce-b44e-cad2022e23e2@infradead.org> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 14 Apr 2020 07:18:01 -0700 Randy Dunlap wrote: > On 4/13/20 7:39 PM, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20200413: > > > > New tree: mhi > > > > My fixes tree contains: > > > > 6b038bdcd3d1 sh: mm: Fix build error > > > > Non-merge commits (relative to Linus' tree): 1154 > > 1160 files changed, 31764 insertions(+), 13498 deletions(-) > > > > ---------------------------------------------------------------------------- > > on x86_64: > # CONFIG_TRANSPARENT_HUGEPAGE is not set Thanks. hm, this took a long time to be discovered. > In file included from ../include/linux/export.h:43:0, > from ../include/linux/linkage.h:7, > from ../include/linux/fs.h:5, > from ../mm/shmem.c:24: > ../mm/shmem.c: In function ‘shmem_undo_range’: > ../include/linux/compiler.h:394:38: error: call to ‘__compiletime_assert_110’ declared with attribute error: BUILD_BUG failed > _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > ^ > ../include/linux/compiler.h:69:3: note: in definition of macro ‘__trace_if_value’ > (cond) ? \ > ^~~~ > ../include/linux/compiler.h:56:28: note: in expansion of macro ‘__trace_if_var’ > #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) > ^~~~~~~~~~~~~~ > ../mm/shmem.c:960:6: note: in expansion of macro ‘if’ > if (index < > ^~ > ../include/linux/kernel.h:71:36: note: in expansion of macro ‘__round_mask’ > #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1) > ^~~~~~~~~~~~ > ../mm/shmem.c:961:10: note: in expansion of macro ‘round_up’ > round_up(start, HPAGE_PMD_NR)) > ^~~~~~~~ > ../include/linux/compiler.h:382:2: note: in expansion of macro ‘__compiletime_assert’ > __compiletime_assert(condition, msg, prefix, suffix) > ^~~~~~~~~~~~~~~~~~~~ > ../include/linux/compiler.h:394:2: note: in expansion of macro ‘_compiletime_assert’ > _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > ^~~~~~~~~~~~~~~~~~~ > ../include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’ > #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) > ^~~~~~~~~~~~~~~~~~ > ../include/linux/build_bug.h:59:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ > #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") > ^~~~~~~~~~~~~~~~ > ../include/linux/huge_mm.h:319:28: note: in expansion of macro ‘BUILD_BUG’ > #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) > ^~~~~~~~~ > ../include/linux/huge_mm.h:115:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’ > #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > ^~~~~~~~~~~~~~~ > ../include/linux/huge_mm.h:116:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’ > #define HPAGE_PMD_NR (1< ^~~~~~~~~~~~~~~ > ../mm/shmem.c:961:26: note: in expansion of macro ‘HPAGE_PMD_NR’ > round_up(start, HPAGE_PMD_NR)) > ^~~~~~~~~~~~ > That's if (index < round_up(start, HPAGE_PMD_NR)) start = index + 1; from Hugh's 71725ed10c40696 ("mm: huge tmpfs: try to split_huge_page() when punching hole").