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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8A2AC433EF for ; Wed, 11 May 2022 08:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243647AbiEKI0v (ORCPT ); Wed, 11 May 2022 04:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232959AbiEKI0k (ORCPT ); Wed, 11 May 2022 04:26:40 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 147104FC65; Wed, 11 May 2022 01:26:33 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01424;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VCvRsTk_1652257590; Received: from 30.30.99.144(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VCvRsTk_1652257590) by smtp.aliyun-inc.com(127.0.0.1); Wed, 11 May 2022 16:26:31 +0800 Message-ID: Date: Wed, 11 May 2022 16:27:09 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: linux-next: build failure after merge of the mm tree To: Stephen Rothwell , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List References: <20220511181531.7f27a5c1@canb.auug.org.au> From: Baolin Wang In-Reply-To: <20220511181531.7f27a5c1@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On 5/11/2022 4:15 PM, Stephen Rothwell wrote: > Hi all, > > After merging the mm tree, today's linux-next build (sparc64 defconfig) > failed like this: > > In file included from include/linux/hugetlb.h:757, > from arch/sparc/mm/hugetlbpage.c:11: > arch/sparc/include/asm/hugetlb.h: In function 'huge_ptep_clear_flush': > arch/sparc/include/asm/hugetlb.h:27:1: error: no return statement in function returning non-void [-Werror=return-type] > 27 | } > | ^ > > (and many more) > > Caused by commit > > 083af99303b9 ("mm: change huge_ptep_clear_flush() to return the original pte") > > I applied the following hack to make it build. > > From: Stephen Rothwell > Date: Wed, 11 May 2022 18:10:56 +1000 > Subject: [PATCH] fix up for "mm: change huge_ptep_clear_flush() to return the original pte" > > Signed-off-by: Stephen Rothwell Sorry for my mistake. LGTM. Reviewed-by: Baolin Wang > --- > arch/sparc/include/asm/hugetlb.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h > index b50aa6f8f9ab..0a26cca24232 100644 > --- a/arch/sparc/include/asm/hugetlb.h > +++ b/arch/sparc/include/asm/hugetlb.h > @@ -24,6 +24,7 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, > static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, > unsigned long addr, pte_t *ptep) > { > + return *ptep; > } > > #define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT