[PATCH] PM: convert PM notifiers to out-of-line code

[PATCH] PM: convert PM notifiers to out-of-line code

[Alan Stern]

This patch (as1008) converts the PM notifier routines from inline
calls to out-of-line code.  It also prevents pm_chain_head from
being created when CONFIG_PM_SLEEP isn't enabled, and EXPORTs the
notifier registration and unregistration routines.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

Index: usb-2.6/include/linux/suspend.h
===================================================================
--- usb-2.6.orig/include/linux/suspend.h
+++ usb-2.6/include/linux/suspend.h
@@ -216,17 +216,8 @@ void __save_processor_state(struct saved
 void __restore_processor_state(struct saved_context *ctxt);
 
 /* kernel/power/main.c */
-extern struct blocking_notifier_head pm_chain_head;
-
-static inline int register_pm_notifier(struct notifier_block *nb)
-{
-	return blocking_notifier_chain_register(&pm_chain_head, nb);
-}
-
-static inline int unregister_pm_notifier(struct notifier_block *nb)
-{
-	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
-}
+extern int register_pm_notifier(struct notifier_block *nb);
+extern int unregister_pm_notifier(struct notifier_block *nb);
 
 #define pm_notifier(fn, pri) {				\
 	static struct notifier_block fn##_nb =			\
Index: usb-2.6/kernel/power/main.c
===================================================================
--- usb-2.6.orig/kernel/power/main.c
+++ usb-2.6/kernel/power/main.c
@@ -24,8 +24,6 @@
 
 #include "power.h"
 
-BLOCKING_NOTIFIER_HEAD(pm_chain_head);
-
 DEFINE_MUTEX(pm_mutex);
 
 #ifdef CONFIG_SUSPEND
Index: usb-2.6/kernel/power/power.h
===================================================================
--- usb-2.6.orig/kernel/power/power.h
+++ usb-2.6/kernel/power/power.h
@@ -203,11 +203,5 @@ static inline int suspend_devices_and_en
 }
 #endif /* !CONFIG_SUSPEND */
 
-/* kernel/power/common.c */
-extern struct blocking_notifier_head pm_chain_head;
-
-static inline int pm_notifier_call_chain(unsigned long val)
-{
-	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
-			== NOTIFY_BAD) ? -EINVAL : 0;
-}
+/* kernel/power/process.c */
+extern int pm_notifier_call_chain(unsigned long val);
Index: usb-2.6/kernel/power/process.c
===================================================================
--- usb-2.6.orig/kernel/power/process.c
+++ usb-2.6/kernel/power/process.c
@@ -283,3 +283,25 @@ void thaw_processes(void)
 }
 
 EXPORT_SYMBOL(refrigerator);
+
+/* Routines for PM-transition notifications */
+
+static BLOCKING_NOTIFIER_HEAD(pm_chain_head);
+
+int register_pm_notifier(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_register(&pm_chain_head, nb);
+}
+EXPORT_SYMBOL_GPL(register_pm_notifier);
+
+int unregister_pm_notifier(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_pm_notifier);
+
+int pm_notifier_call_chain(unsigned long val)
+{
+	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
+			== NOTIFY_BAD) ? -EINVAL : 0;
+}

Re: [PATCH] PM: convert PM notifiers to out-of-line code

[Rafael J. Wysocki]

On Monday, 5 of November 2007, Alan Stern wrote:
> This patch (as1008) converts the PM notifier routines from inline
> calls to out-of-line code.  It also prevents pm_chain_head from
> being created when CONFIG_PM_SLEEP isn't enabled, and EXPORTs the
> notifier registration and unregistration routines.
> 
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

I'd prefer to define the routines in main.c, because I really don't consider
them as being strictly related to the freezing of processes.

Greetings,
Rafael


> ---
> 
> Index: usb-2.6/include/linux/suspend.h
> ===================================================================
> --- usb-2.6.orig/include/linux/suspend.h
> +++ usb-2.6/include/linux/suspend.h
> @@ -216,17 +216,8 @@ void __save_processor_state(struct saved
>  void __restore_processor_state(struct saved_context *ctxt);
>  
>  /* kernel/power/main.c */
> -extern struct blocking_notifier_head pm_chain_head;
> -
> -static inline int register_pm_notifier(struct notifier_block *nb)
> -{
> -	return blocking_notifier_chain_register(&pm_chain_head, nb);
> -}
> -
> -static inline int unregister_pm_notifier(struct notifier_block *nb)
> -{
> -	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
> -}
> +extern int register_pm_notifier(struct notifier_block *nb);
> +extern int unregister_pm_notifier(struct notifier_block *nb);
>  
>  #define pm_notifier(fn, pri) {				\
>  	static struct notifier_block fn##_nb =			\
> Index: usb-2.6/kernel/power/main.c
> ===================================================================
> --- usb-2.6.orig/kernel/power/main.c
> +++ usb-2.6/kernel/power/main.c
> @@ -24,8 +24,6 @@
>  
>  #include "power.h"
>  
> -BLOCKING_NOTIFIER_HEAD(pm_chain_head);
> -
>  DEFINE_MUTEX(pm_mutex);
>  
>  #ifdef CONFIG_SUSPEND
> Index: usb-2.6/kernel/power/power.h
> ===================================================================
> --- usb-2.6.orig/kernel/power/power.h
> +++ usb-2.6/kernel/power/power.h
> @@ -203,11 +203,5 @@ static inline int suspend_devices_and_en
>  }
>  #endif /* !CONFIG_SUSPEND */
>  
> -/* kernel/power/common.c */
> -extern struct blocking_notifier_head pm_chain_head;
> -
> -static inline int pm_notifier_call_chain(unsigned long val)
> -{
> -	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
> -			== NOTIFY_BAD) ? -EINVAL : 0;
> -}
> +/* kernel/power/process.c */
> +extern int pm_notifier_call_chain(unsigned long val);
> Index: usb-2.6/kernel/power/process.c
> ===================================================================
> --- usb-2.6.orig/kernel/power/process.c
> +++ usb-2.6/kernel/power/process.c
> @@ -283,3 +283,25 @@ void thaw_processes(void)
>  }
>  
>  EXPORT_SYMBOL(refrigerator);
> +
> +/* Routines for PM-transition notifications */
> +
> +static BLOCKING_NOTIFIER_HEAD(pm_chain_head);
> +
> +int register_pm_notifier(struct notifier_block *nb)
> +{
> +	return blocking_notifier_chain_register(&pm_chain_head, nb);
> +}
> +EXPORT_SYMBOL_GPL(register_pm_notifier);
> +
> +int unregister_pm_notifier(struct notifier_block *nb)
> +{
> +	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
> +}
> +EXPORT_SYMBOL_GPL(unregister_pm_notifier);
> +
> +int pm_notifier_call_chain(unsigned long val)
> +{
> +	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
> +			== NOTIFY_BAD) ? -EINVAL : 0;
> +}

Re: [PATCH] PM: convert PM notifiers to out-of-line code

[Alan Stern]

This patch (as1008b) converts the PM notifier routines from inline
calls to out-of-line code.  It also prevents pm_chain_head from
being created when CONFIG_PM_SLEEP isn't enabled, and EXPORTs the
notifier registration and unregistration routines.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

On Mon, 5 Nov 2007, Rafael J. Wysocki wrote:

> I'd prefer to define the routines in main.c, because I really don't consider
> them as being strictly related to the freezing of processes.

Okay, here's a version which does that.

Alan Stern


Index: usb-2.6/include/linux/suspend.h
===================================================================
--- usb-2.6.orig/include/linux/suspend.h
+++ usb-2.6/include/linux/suspend.h
@@ -216,17 +216,8 @@ void __save_processor_state(struct saved
 void __restore_processor_state(struct saved_context *ctxt);
 
 /* kernel/power/main.c */
-extern struct blocking_notifier_head pm_chain_head;
-
-static inline int register_pm_notifier(struct notifier_block *nb)
-{
-	return blocking_notifier_chain_register(&pm_chain_head, nb);
-}
-
-static inline int unregister_pm_notifier(struct notifier_block *nb)
-{
-	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
-}
+extern int register_pm_notifier(struct notifier_block *nb);
+extern int unregister_pm_notifier(struct notifier_block *nb);
 
 #define pm_notifier(fn, pri) {				\
 	static struct notifier_block fn##_nb =			\
Index: usb-2.6/kernel/power/main.c
===================================================================
--- usb-2.6.orig/kernel/power/main.c
+++ usb-2.6/kernel/power/main.c
@@ -24,10 +24,34 @@
 
 #include "power.h"
 
-BLOCKING_NOTIFIER_HEAD(pm_chain_head);
-
 DEFINE_MUTEX(pm_mutex);
 
+#ifdef CONFIG_PM_SLEEP
+
+/* Routines for PM-transition notifications */
+
+static BLOCKING_NOTIFIER_HEAD(pm_chain_head);
+
+int register_pm_notifier(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_register(&pm_chain_head, nb);
+}
+EXPORT_SYMBOL_GPL(register_pm_notifier);
+
+int unregister_pm_notifier(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_unregister(&pm_chain_head, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_pm_notifier);
+
+int pm_notifier_call_chain(unsigned long val)
+{
+	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
+			== NOTIFY_BAD) ? -EINVAL : 0;
+}
+
+#endif /* CONFIG_PM_SLEEP */
+
 #ifdef CONFIG_SUSPEND
 
 /* This is just an arbitrary number */
Index: usb-2.6/kernel/power/power.h
===================================================================
--- usb-2.6.orig/kernel/power/power.h
+++ usb-2.6/kernel/power/power.h
@@ -203,11 +203,7 @@ static inline int suspend_devices_and_en
 }
 #endif /* !CONFIG_SUSPEND */
 
-/* kernel/power/common.c */
-extern struct blocking_notifier_head pm_chain_head;
-
-static inline int pm_notifier_call_chain(unsigned long val)
-{
-	return (blocking_notifier_call_chain(&pm_chain_head, val, NULL)
-			== NOTIFY_BAD) ? -EINVAL : 0;
-}
+#ifdef CONFIG_PM_SLEEP
+/* kernel/power/main.c */
+extern int pm_notifier_call_chain(unsigned long val);
+#endif