Re: [PATCH] PM / sleep: Fix broken builds without CONFIG_PM_SLEEP_DEBUG

["Rafael J. Wysocki" <rjw@rjwysocki.net>]

On Tuesday, September 15, 2015 01:42:21 PM Viresh Kumar wrote:
> The variable 'wakeup_irq' is defined within #ifdef CONFIG_PM_SLEEP_DEBUG
> and used outside of it. And that breaks kernel build:
> 
> /home/viresh/linux/drivers/base/power/wakeup.c:871: undefined reference to `wakeup_irq'
> /home/viresh/drivers/base/power/wakeup.c:871: undefined reference to `wakeup_irq'
> 
> Fix it by defining the variable outside of the ifdef.
> 
> Fixes: d1e59c235322 ("PM / sleep: Report interrupt that caused system wakeup")
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

I've applied the v11 of the Alexandra's patch that doesn't have this problem AFAICS.

> ---
>  kernel/power/main.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/power/main.c b/kernel/power/main.c
> index 9880bf888a5b..f97a188f4ccc 100644
> --- a/kernel/power/main.c
> +++ b/kernel/power/main.c
> @@ -235,6 +235,9 @@ late_initcall(pm_debugfs_init);
>  
>  #endif /* CONFIG_PM_SLEEP */
>  
> +/* IRQ number which causes system wakeup */
> +unsigned int wakeup_irq;
> +
>  #ifdef CONFIG_PM_SLEEP_DEBUG
>  /*
>   * pm_print_times: print time taken by devices to suspend and resume.
> @@ -273,7 +276,6 @@ static inline void pm_print_times_init(void)
>  	pm_print_times_enabled = !!initcall_debug;
>  }
>  
> -unsigned int wakeup_irq;
>  static ssize_t pm_wakeup_irq_show(struct kobject *kobj,
>  					struct kobj_attribute *attr,
>  					char *buf)
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.