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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42B25C4646D for ; Thu, 27 Jun 2019 22:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 255902075E for ; Thu, 27 Jun 2019 22:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726691AbfF0WAE (ORCPT ); Thu, 27 Jun 2019 18:00:04 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:46740 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726498AbfF0WAD (ORCPT ); Thu, 27 Jun 2019 18:00:03 -0400 Received: from 79.184.254.216.ipv4.supernova.orange.pl (79.184.254.216) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.267) id b993f47717c4d2a7; Fri, 28 Jun 2019 00:00:00 +0200 From: "Rafael J. Wysocki" To: Mathieu Malaterre Cc: Michael Ellerman , Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Martin Schwidefsky , Heiko Carstens , Pavel Machek , Len Brown , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [PATCH v2] powerpc/power: Expose pfn_is_nosave prototype Date: Fri, 28 Jun 2019 00:00:00 +0200 Message-ID: <2178909.1BmBeJAm6j@kreacher> In-Reply-To: <20190524104418.17194-1-malat@debian.org> References: <20190523114736.30268-1-malat@debian.org> <20190524104418.17194-1-malat@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, May 24, 2019 12:44:18 PM CEST Mathieu Malaterre wrote: > The declaration for pfn_is_nosave is only available in > kernel/power/power.h. Since this function can be override in arch, > expose it globally. Having a prototype will make sure to avoid warning > (sometime treated as error with W=1) such as: > > arch/powerpc/kernel/suspend.c:18:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] > > This moves the declaration into a globally visible header file and add > missing include to avoid a warning on powerpc. Also remove the > duplicated prototypes since not required anymore. > > Cc: Christophe Leroy > Signed-off-by: Mathieu Malaterre > --- > v2: As suggestion by christophe remove duplicates prototypes > > arch/powerpc/kernel/suspend.c | 1 + > arch/s390/kernel/entry.h | 1 - > include/linux/suspend.h | 1 + > kernel/power/power.h | 2 -- > 4 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/suspend.c b/arch/powerpc/kernel/suspend.c > index a531154cc0f3..9e1b6b894245 100644 > --- a/arch/powerpc/kernel/suspend.c > +++ b/arch/powerpc/kernel/suspend.c > @@ -8,6 +8,7 @@ > */ > > #include > +#include > #include > #include > > diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h > index 20420c2b8a14..b2956d49b6ad 100644 > --- a/arch/s390/kernel/entry.h > +++ b/arch/s390/kernel/entry.h > @@ -63,7 +63,6 @@ void __init startup_init(void); > void die(struct pt_regs *regs, const char *str); > int setup_profiling_timer(unsigned int multiplier); > void __init time_init(void); > -int pfn_is_nosave(unsigned long); > void s390_early_resume(void); > unsigned long prepare_ftrace_return(unsigned long parent, unsigned long sp, unsigned long ip); > > diff --git a/include/linux/suspend.h b/include/linux/suspend.h > index 6b3ea9ea6a9e..e8b8a7bede90 100644 > --- a/include/linux/suspend.h > +++ b/include/linux/suspend.h > @@ -395,6 +395,7 @@ extern bool system_entering_hibernation(void); > extern bool hibernation_available(void); > asmlinkage int swsusp_save(void); > extern struct pbe *restore_pblist; > +int pfn_is_nosave(unsigned long pfn); > #else /* CONFIG_HIBERNATION */ > static inline void register_nosave_region(unsigned long b, unsigned long e) {} > static inline void register_nosave_region_late(unsigned long b, unsigned long e) {} > diff --git a/kernel/power/power.h b/kernel/power/power.h > index 9e58bdc8a562..44bee462ff57 100644 > --- a/kernel/power/power.h > +++ b/kernel/power/power.h > @@ -75,8 +75,6 @@ static inline void hibernate_reserved_size_init(void) {} > static inline void hibernate_image_size_init(void) {} > #endif /* !CONFIG_HIBERNATION */ > > -extern int pfn_is_nosave(unsigned long); > - > #define power_attr(_name) \ > static struct kobj_attribute _name##_attr = { \ > .attr = { \ > Applied, thanks!