diff mbox

[-next,v3] thermal: fix x86_pkg_temp_thermal.c build and Kconfig

Message ID 51BF6315.9020501@infradead.org (mailing list archive)
State Accepted, archived
Delegated to: Zhang Rui
Headers show

Commit Message

Randy Dunlap June 17, 2013, 7:27 p.m. UTC
From: Randy Dunlap <rdunlap@infradead.org>

Fix build error in x86_pkg_temp_thermal.c.  It requires that
X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol,
since it depends on X86_MCE (indirectly).

Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
so remove that duplicated dependency.

ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
---
 drivers/thermal/Kconfig |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Borislav Petkov June 17, 2013, 7:45 p.m. UTC | #1
On Mon, Jun 17, 2013 at 12:27:17PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build error in x86_pkg_temp_thermal.c.  It requires that
> X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol,
> since it depends on X86_MCE (indirectly).
> 
> Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
> so remove that duplicated dependency.
> 
> ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
> ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> ---
>  drivers/thermal/Kconfig |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> --- linux-next-20130617.orig/drivers/thermal/Kconfig
> +++ linux-next-20130617/drivers/thermal/Kconfig
> @@ -171,8 +171,7 @@ config INTEL_POWERCLAMP
>  
>  config X86_PKG_TEMP_THERMAL
>  	tristate "X86 package temperature thermal driver"
> -	depends on THERMAL
> -	depends on X86
> +	depends on X86_THERMAL_VECTOR
>  	select THERMAL_GOV_USER_SPACE
>  	default m
>  	help

Acked-by: Borislav Petkov <bp@suse.de>
Zhang, Rui June 17, 2013, 11:28 p.m. UTC | #2
On Mon, 2013-06-17 at 21:45 +0200, Borislav Petkov wrote:
> On Mon, Jun 17, 2013 at 12:27:17PM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@infradead.org>
> > 
> > Fix build error in x86_pkg_temp_thermal.c.  It requires that
> > X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol,
> > since it depends on X86_MCE (indirectly).
> > 
> > Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
> > so remove that duplicated dependency.
> > 
> > ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
> > ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
> > 
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> > ---
> >  drivers/thermal/Kconfig |    3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > --- linux-next-20130617.orig/drivers/thermal/Kconfig
> > +++ linux-next-20130617/drivers/thermal/Kconfig
> > @@ -171,8 +171,7 @@ config INTEL_POWERCLAMP
> >  
> >  config X86_PKG_TEMP_THERMAL
> >  	tristate "X86 package temperature thermal driver"
> > -	depends on THERMAL
> > -	depends on X86
> > +	depends on X86_THERMAL_VECTOR
> >  	select THERMAL_GOV_USER_SPACE
> >  	default m
> >  	help
> 
> Acked-by: Borislav Petkov <bp@suse.de>
> 
applied to thermal -next.

thanks,
rui

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-next-20130617.orig/drivers/thermal/Kconfig
+++ linux-next-20130617/drivers/thermal/Kconfig
@@ -171,8 +171,7 @@  config INTEL_POWERCLAMP
 
 config X86_PKG_TEMP_THERMAL
 	tristate "X86 package temperature thermal driver"
-	depends on THERMAL
-	depends on X86
+	depends on X86_THERMAL_VECTOR
 	select THERMAL_GOV_USER_SPACE
 	default m
 	help