From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=N68d=SK=vger.kernel.org=linux-kernel-owner@kernel.org>
Date: Mon, 8 Apr 2019 15:28:23 +0200
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: [PATCH] s390/mm: Silence compiler warning when compiling without
 CONFIG_PGSTE
References: <20190407125509.6380-1-thuth@redhat.com>
 <0e63589f-190f-d3a4-b373-4188dfe54e26@redhat.com>
 <84da6d4e-9b85-1c3b-4f48-bdb19ac7f650@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <84da6d4e-9b85-1c3b-4f48-bdb19ac7f650@redhat.com>
Message-Id: <20190408132823.GA13200@osiris>
Sender: linux-kernel-owner@vger.kernel.org
List-Archive: <https://lore.kernel.org/lkml/>
List-Post: <mailto:linux-kernel@vger.kernel.org>
To: Thomas Huth <thuth@redhat.com>
Cc: David Hildenbrand <david@redhat.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
List-ID: <linux-s390.vger.kernel.org>

On Mon, Apr 08, 2019 at 12:36:32PM +0200, Thomas Huth wrote:
> On 08/04/2019 09.09, David Hildenbrand wrote:
> > On 07.04.19 14:55, Thomas Huth wrote:
> >> If CONFIG_PGSTE is not set (e.g. when compiling without KVM), GCC complains:
> >>
> >>   CC      arch/s390/mm/pgtable.o
> >> arch/s390/mm/pgtable.c:413:15: warning: ‘pmd_alloc_map’ defined but not
> >>  used [-Wunused-function]
> >>  static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
> >>                ^~~~~~~~~~~~~
> >>
> >> Wrap the function with "#ifdef CONFIG_PGSTE" to silence the warning.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  arch/s390/mm/pgtable.c | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
> >> index 8485d6dc2754..9ebd01219812 100644
> >> --- a/arch/s390/mm/pgtable.c
> >> +++ b/arch/s390/mm/pgtable.c
> >> @@ -410,6 +410,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm,
> >>  	return old;
> >>  }
> >>  
> >> +#ifdef CONFIG_PGSTE
> >>  static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
> >>  {
> >>  	pgd_t *pgd;
> >> @@ -427,6 +428,7 @@ static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
> >>  	pmd = pmd_alloc(mm, pud, addr);
> >>  	return pmd;
> >>  }
> >> +#endif
> >>  
> > 
> > We could also move the function down to the functions where it is used
> 
> Yeah, I thought about that, too. Both have advantages:
> 
> - If we keep the code here, "git blame" shows a nicer history of these
>   lines
> - If we move the code, we need less #ifdefs
> 
> I'll leave the decision to the maintainers... Martin, Heiko?

Applied without changes. Thanks!