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 E0D60C433EF for ; Wed, 5 Jan 2022 17:40:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A7286B0071; Wed, 5 Jan 2022 12:40:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 056BA6B0073; Wed, 5 Jan 2022 12:40:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E606A6B0074; Wed, 5 Jan 2022 12:40:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id CE8246B0071 for ; Wed, 5 Jan 2022 12:40:55 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 749BF181B0495 for ; Wed, 5 Jan 2022 17:40:55 +0000 (UTC) X-FDA: 78996948870.30.F36BB17 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 805E040005 for ; Wed, 5 Jan 2022 17:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RTJxwLl+pm7Ff+UKXl9jyuyYhU7kQqFATFz9yxORmSQ=; b=Waxs5JjT7qV1ScF1HUqjEizvXw 1uci335s6o4lX2mbH1hheG8Bwf8imBq1QkvGBzCw8pNVudtKHFmSKDcAtg4Rqt7o5ySRsHAgT8rjQ zxJM+XaEPF/Hu8YRNx1743hkvJt43+eRjH2JsusfZLnxxCLVbSKierPUQaUcuRKTMpZ1LO6+sqQiU r2PAjVgYiGbDrlMMjf4uLKfLMKlwxVZ+QjImY+sGMRdIH6VdYD14sdo51FC1QvVO2XtNMyg9MtDZb bl1CcTFr71a+GJbVEwBV6mU0v6adS4mZBnf2/tfepLUiWn2MxaVb6PjdniklXECmmkCDcvsYJjsFN Lq1+uHCA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5AHE-00ElOm-RT; Wed, 05 Jan 2022 17:40:44 +0000 Date: Wed, 5 Jan 2022 17:40:44 +0000 From: Matthew Wilcox To: 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 Subject: Re: [next] mm/shmem.c:3993:5: error: conflicting types for 'shmem_unuse'; have 'int(unsigned int, long unsigned int *)' Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 805E040005 X-Stat-Signature: njsr989owh7pi9opq13fceaqprday347 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Waxs5JjT; dmarc=none; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam11 X-HE-Tag: 1641404450-409336 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 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: +++ 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; }