From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH] PM: convert PM notifiers to out-of-line code Date: Mon, 5 Nov 2007 23:01:29 +0100 Message-ID: <200711052301.30112.rjw@sisk.pl> References: Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: Alan Stern Cc: Linux-pm mailing list List-Id: linux-pm@vger.kernel.org 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 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; > +}