lkml.org 
[lkml]   [2008]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/37] PM: Convert PM notifiers to out-of-line code
    Date
    From: Alan Stern <stern@rowland.harvard.edu>

    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>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    include/linux/suspend.h | 13 ++-----------
    kernel/power/main.c | 28 ++++++++++++++++++++++++++--
    kernel/power/power.h | 12 ++++--------
    3 files changed, 32 insertions(+), 21 deletions(-)

    diff --git a/include/linux/suspend.h b/include/linux/suspend.h
    index 40280df..51283e0 100644
    --- a/include/linux/suspend.h
    +++ b/include/linux/suspend.h
    @@ -213,17 +213,8 @@ void save_processor_state(void);
    void restore_processor_state(void);

    /* 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 = \
    diff --git a/kernel/power/main.c b/kernel/power/main.c
    index fc717b8..0a9f269 100644
    --- a/kernel/power/main.c
    +++ b/kernel/power/main.c
    @@ -24,13 +24,37 @@

    #include "power.h"

    -BLOCKING_NOTIFIER_HEAD(pm_chain_head);
    -
    DEFINE_MUTEX(pm_mutex);

    unsigned int pm_flags;
    EXPORT_SYMBOL(pm_flags);

    +#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_PM_DEBUG
    int pm_test_level = TEST_NONE;

    diff --git a/kernel/power/power.h b/kernel/power/power.h
    index f9f0d4d..a9732fd 100644
    --- a/kernel/power/power.h
    +++ b/kernel/power/power.h
    @@ -172,14 +172,10 @@ static inline int suspend_devices_and_enter(suspend_state_t state)
    }
    #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

    #ifdef CONFIG_HIGHMEM
    unsigned int count_highmem_pages(void);
    --
    1.5.4.rc5.16.gc0279


    \
     
     \ /
      Last update: 2008-02-01 06:13    [W:2.285 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site