Skip to contentSkip to conversation

powerpc/power: Expose pfn_is_nosave prototype

PATCH Superseded Mathieu Malaterre 4 participants 8 messages May 23, 2019 – Jun 27, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/power: Expose pfn_is_nosave prototype

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 in powerpc.

---
 arch/powerpc/kernel/suspend.c | 1 +
 include/linux/suspend.h       | 1 +
 2 files changed, 2 insertions(+)
arch/powerpc/kernel/suspend.c +1 -0
index a531154cc0f3..9e1b6b894245 100644
@@ -8,6 +8,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/suspend.h>
 #include <asm/page.h>
 #include <asm/sections.h>
 
include/linux/suspend.h +1 -0
index 3f529ad9a9d2..2660bbdf5230 100644
@@ -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) {}
Signature · 1 line
2.20.1
#1 lore raw

Le 23/05/2019 à 13:47, Mathieu Malaterre a écrit :

Quoted 9 lines

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 in powerpc.

Then you should also drop it from kernel/power/power.h and arch/s390/kernel/entry.h

Christophe

Quoted 32 lines
---
  arch/powerpc/kernel/suspend.c | 1 +
  include/linux/suspend.h       | 1 +
  2 files changed, 2 insertions(+)
arch/powerpc/kernel/suspend.c +1 -0
index a531154cc0f3..9e1b6b894245 100644
@@ -8,6 +8,7 @@
   */
 
  #include <linux/mm.h>
+#include <linux/suspend.h>
  #include <asm/page.h>
  #include <asm/sections.h>
 
include/linux/suspend.h +1 -0
index 3f529ad9a9d2..2660bbdf5230 100644
@@ -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) {}
#2 lore raw

PATCH v2 1/1 powerpc/power: Expose pfn_is_nosave prototype

In reply to Mathieu Malaterre

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.

---
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(-)
arch/powerpc/kernel/suspend.c +1 -0
index a531154cc0f3..9e1b6b894245 100644
@@ -8,6 +8,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/suspend.h>
 #include <asm/page.h>
 #include <asm/sections.h>
 
arch/s390/kernel/entry.h +0 -1
index 20420c2b8a14..b2956d49b6ad 100644
@@ -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);
 
include/linux/suspend.h +1 -0
index 6b3ea9ea6a9e..e8b8a7bede90 100644
@@ -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) {}
kernel/power/power.h +0 -2
index 9e58bdc8a562..44bee462ff57 100644
@@ -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	= {				\
Signature · 1 line
2.20.1
#3 lore raw
Quoted 64 lines · CEST Mathieu Malaterre

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.

---
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(-)
arch/powerpc/kernel/suspend.c +1 -0
index a531154cc0f3..9e1b6b894245 100644
@@ -8,6 +8,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/suspend.h>
 #include <asm/page.h>
 #include <asm/sections.h>
 
arch/s390/kernel/entry.h +0 -1
index 20420c2b8a14..b2956d49b6ad 100644
@@ -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);
 
include/linux/suspend.h +1 -0
index 6b3ea9ea6a9e..e8b8a7bede90 100644
@@ -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) {}
kernel/power/power.h +0 -0
index 9e58bdc8a562..44bee462ff57 100644

kernel/power/power.h static inline void hibernate_reserved_size_init(void) {} · line 80

Quoted 8 lines
kernel/power/power.h +0 -2
@@ -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	= {				\

With an ACK from the powerpc maintainers, I could apply this one.

#4 lore raw
Quoted 31 lines · Rafael J. Wysocki
Quoted 30 lines · CEST Mathieu Malaterre

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.

---
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(-)
kernel/power/power.h +0 -0
index 9e58bdc8a562..44bee462ff57 100644
@@ -75,8 +75,6 @@ static inline void hibernate_reserved_size_init(void) {}
 static inline void hibernate_image_size_init(void) {}
 #endif /* !CONFIG_HIBERNATION */
 
Quoted 8 lines

kernel/power/power.h static inline void hibernate_reserved_size_init(void) {} · line 80

Quoted 6 lines
kernel/power/power.h +0 -2
-extern int pfn_is_nosave(unsigned long);
-
 #define power_attr(_name) \
 static struct kobj_attribute _name##_attr = {	\
 	.attr	= {				\

With an ACK from the powerpc maintainers, I could apply this one.

Sent.

cheers

#5 lore raw
Quoted 41 lines · CEST Michael Ellerman
Quoted 31 lines · Rafael J. Wysocki
Quoted 30 lines · CEST Mathieu Malaterre

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.

---
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(-)
kernel/power/power.h +0 -0
index 9e58bdc8a562..44bee462ff57 100644
@@ -75,8 +75,6 @@ static inline void hibernate_reserved_size_init(void) {}
 static inline void hibernate_image_size_init(void) {}
 #endif /* !CONFIG_HIBERNATION */
 
Quoted 8 lines

kernel/power/power.h static inline void hibernate_reserved_size_init(void) {} · line 80

Quoted 6 lines
kernel/power/power.h +0 -2
-extern int pfn_is_nosave(unsigned long);
-
 #define power_attr(_name) \
 static struct kobj_attribute _name##_attr = {	\
 	.attr	= {				\

With an ACK from the powerpc maintainers, I could apply this one.

Quoted 1 line

Sent.

Thanks!

reviewer Acked-by on v2 1/1
#6 lore raw
In reply to Mathieu Malaterre
Quoted 13 lines · Mathieu Malaterre

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.

Quoted 8 lines

---
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(-)

Looks fine to me.

cheers

#7 lore raw
In reply to Mathieu Malaterre
Quoted 64 lines · CEST Mathieu Malaterre

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.

---
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(-)
arch/powerpc/kernel/suspend.c +1 -0
index a531154cc0f3..9e1b6b894245 100644
@@ -8,6 +8,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/suspend.h>
 #include <asm/page.h>
 #include <asm/sections.h>
 
arch/s390/kernel/entry.h +0 -1
index 20420c2b8a14..b2956d49b6ad 100644
@@ -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);
 
include/linux/suspend.h +1 -0
index 6b3ea9ea6a9e..e8b8a7bede90 100644
@@ -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) {}
kernel/power/power.h +0 -0
index 9e58bdc8a562..44bee462ff57 100644

kernel/power/power.h static inline void hibernate_reserved_size_init(void) {} · line 80

Quoted 8 lines
kernel/power/power.h +0 -2
@@ -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!