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 <willy@infradead.org>,
        Naresh Kamboju <naresh.kamboju@linaro.org>
Cc:     linux-mm <linux-mm@kvack.org>,
        open list <linux-kernel@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Hugh Dickins <hughd@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Christoph Hellwig <hch@lst.de>,
        Juergen Gross <jgross@suse.com>,
        Dan Streetman <ddstreet@ieee.org>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
        Seth Jennings <sjenning@redhat.com>,
        Vitaly Wool <vitaly.wool@konsulko.com>,
        lkft-triage@lists.linaro.org
References: <CA+G9fYvXfD3wS8eJV6A6GygqhJb3AUF9OROQAkBRRTN+thVo-g@mail.gmail.com>
 <YdXYHP5gPMRzmv0B@casper.infradead.org>
From:   Randy Dunlap <rdunlap@infradead.org>
In-Reply-To: <YdXYHP5gPMRzmv0B@casper.infradead.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


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 <rdunlap@infradead.org> # 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