From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56F3AC433EF for ; Thu, 6 Jan 2022 02:38:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F5CA6B007D; Wed, 5 Jan 2022 21:38:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A4966B007E; Wed, 5 Jan 2022 21:38:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 593E96B0080; Wed, 5 Jan 2022 21:38:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0102.hostedemail.com [216.40.44.102]) by kanga.kvack.org (Postfix) with ESMTP id 4B0756B007D for ; Wed, 5 Jan 2022 21:38:55 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EB76A1801A210 for ; Thu, 6 Jan 2022 02:38:54 +0000 (UTC) X-FDA: 78998304588.14.ECE69C0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id EB0D3140006 for ; Thu, 6 Jan 2022 02:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description; bh=IoUlGEH/xqrV07najlhYyl2fC5yKIy9uFAiZQwDiAD4=; b=bH8zsFsvZVmlTk7euNsOfQBiQy TQG3pk1XOSzYDEkc/ki9qtzAVIbGUWlaDz6Guy056ifz2+S4b9EvsiGgVeHzDk2rXHOJicCR9Fykk m0mbNZX5slU0SGxqmbPvJnjsrmKUxp/z0XUro94iOFwFGX69JSqqVO07MOJT5U3SxUejjO3lNgHOF 6RZ8gdfKASIPL1KtKQ9VLKljlOdtgwO1sIzuUDM/udldJC09Tny1xFFSPWFhoemZ5lcVf+raH36Nh 453Vs1AcAZSjN/t7jSR74ynziDELJ9m7sUg9hmSpP1vPDVOrTcj6rAXPiIfFlvNCJ8azuxUoEaICv vQC4Z+mA==; Received: from [2601:1c0:6280:3f0::aa0b] by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5Ifv-00F5zd-GZ; Thu, 06 Jan 2022 02:38:47 +0000 Message-ID: <8b423739-abe6-7e48-1a20-149ae56df108@infradead.org> Date: Wed, 5 Jan 2022 18:38:42 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [next] mm/shmem.c:3993:5: error: conflicting types for 'shmem_unuse'; have 'int(unsigned int, long unsigned int *)' Content-Language: en-US To: Matthew Wilcox , Naresh Kamboju Cc: linux-mm , open list , Linux-Next Mailing List , Hugh Dickins , Andrew Morton , Stephen Rothwell , Christoph Hellwig , Juergen Gross , Dan Streetman , Geert Uytterhoeven , Konrad Rzeszutek Wilk , Seth Jennings , Vitaly Wool , lkft-triage@lists.linaro.org References: From: Randy Dunlap In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=bH8zsFsv; dmarc=none; spf=none (imf09.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=rdunlap@infradead.org X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EB0D3140006 X-Stat-Signature: fuorwa1qq67wznw4mg4xkgmp4n74a11x X-HE-Tag: 1641436724-333391 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 1/5/22 09:40, Matthew Wilcox wrote: > On Wed, Jan 05, 2022 at 08:01:19PM +0530, Naresh Kamboju wrote: >> mm/shmem.c:3993:5: error: conflicting types for 'shmem_unuse'; have >> 'int(unsigned int, long unsigned int *)' >> 3993 | int shmem_unuse(unsigned int type, unsigned long *fs_pages_to_unuse) >> | ^~~~~~~~~~~ >> In file included from include/linux/khugepaged.h:6, >> from mm/shmem.c:37: >> include/linux/shmem_fs.h:86:5: note: previous declaration of >> 'shmem_unuse' with type 'int(unsigned int)' >> 86 | int shmem_unuse(unsigned int type); >> | ^~~~~~~~~~~ > > This is "mm: simplify try_to_unuse" in akpm's tree. > > It needs a fix that looks something like this: Acked-by: Randy Dunlap # build-tested thanks. > > +++ b/mm/shmem.c > @@ -3990,7 +3990,7 @@ int __init shmem_init(void) > return 0; > } > > -int shmem_unuse(unsigned int type, unsigned long *fs_pages_to_unuse) > +int shmem_unuse(unsigned int type) > { > return 0; > } > -- ~Randy