linux-kernel - Re: PM / OPP: Fix build when CONFIG_PM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 3 Nov 2011 01:21:42 +0100
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Tony Lindgren <tony@...mide.com>
Cc:	linux-kernel@...r.kernel.org, linux-omap@...r.kernel.org,
	linux-pm@...ts.linux-foundation.org,
	MyungJoo Ham <myungjoo.ham@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Mike Turquette <mturquette@...com>,
	Kevin Hilman <khilman@...com>
Subject: Re: PM / OPP: Fix build when CONFIG_PM_OPP is not set

On Wednesday, November 02, 2011, Tony Lindgren wrote:
> Commit 03ca370fbf7b76d6d002380dbdc2cdc2319f9c80 (PM / OPP: Add
> OPP availability change notifier) does not compile if CONFIG_PM_OPP
> is not set:
> 
> arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier':
> include/linux/opp.h:103: multiple definition of `opp_get_notifier'
> include/linux/opp.h:103: first defined here
> 
> Also fix incorrect comment.
> 
> Cc: MyungJoo Ham <myungjoo.ham@...sung.com>
> Cc: Kyungmin Park <kyungmin.park@...sung.com>
> Cc: Mike Turquette <mturquette@...com>
> Cc: Kevin Hilman <khilman@...com>
> Cc: Rafael J. Wysocki <rjw@...k.pl>
> Signed-off-by: Tony Lindgren <tony@...mide.com>

Applied to linux-pm/linux-next.

Thanks,
Rafael


> ---
> 
> I'm seeing this with omap1_defconfig at least.
> 
> --- a/include/linux/opp.h
> +++ b/include/linux/opp.h
> @@ -97,11 +97,11 @@ static inline int opp_disable(struct device *dev, unsigned long freq)
>  	return 0;
>  }
>  
> -struct srcu_notifier_head *opp_get_notifier(struct device *dev)
> +static inline struct srcu_notifier_head *opp_get_notifier(struct device *dev)
>  {
>  	return ERR_PTR(-EINVAL);
>  }
> -#endif		/* CONFIG_PM */
> +#endif		/* CONFIG_PM_OPP */
>  
>  #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
>  int opp_init_cpufreq_table(struct device *dev,
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/