diff mbox

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

Message ID 51BF5174.805@infradead.org (mailing list archive)
State Superseded, archived
Delegated to: Zhang Rui
Headers show

Commit Message

Randy Dunlap June 17, 2013, 6:12 p.m. UTC
On 06/17/13 11:09, Srinivas Pandruvada wrote:
> Sorry for this issue. I was about to submit a patch for this,
> 
> You should change to
> 
> depends on X86 && X86_MCE && X86_THERMAL_VECTOR

---
From: Randy Dunlap <rdunlap@infradead.org>

Fix build error in x86_pkg_temp_thermal.c.  It requires that
X86_MCE be enabled, so depend on that symbol.
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, 6:17 p.m. UTC | #1
On Mon, Jun 17, 2013 at 11:12:04AM -0700, Randy Dunlap wrote:
> On 06/17/13 11:09, Srinivas Pandruvada wrote:
> > Sorry for this issue. I was about to submit a patch for this,
> > 
> > You should change to
> > 
> > depends on X86 && X86_MCE && X86_THERMAL_VECTOR
> 
> ---
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build error in x86_pkg_temp_thermal.c.  It requires that
> X86_MCE be enabled, so depend on that symbol.
> 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 && X86_MCE && X86_THERMAL_VECTOR

X86_THERMAL_VECTOR depends on X86_MCE_INTEL which depends on X86_MCE. So

	depends on X86_THERMAL_VECTOR

should be enough, IMO.
Srinivas Pandruvada June 17, 2013, 6:31 p.m. UTC | #2
On 06/17/2013 11:17 AM, Borislav Petkov wrote:
> On Mon, Jun 17, 2013 at 11:12:04AM -0700, Randy Dunlap wrote:
>> On 06/17/13 11:09, Srinivas Pandruvada wrote:
>>> Sorry for this issue. I was about to submit a patch for this,
>>>
>>> You should change to
>>>
>>> depends on X86 && X86_MCE && X86_THERMAL_VECTOR
>> ---
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build error in x86_pkg_temp_thermal.c.  It requires that
>> X86_MCE be enabled, so depend on that symbol.
>> 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 && X86_MCE && X86_THERMAL_VECTOR
> X86_THERMAL_VECTOR depends on X86_MCE_INTEL which depends on X86_MCE. So
>
> 	depends on X86_THERMAL_VECTOR
>
> should be enough, IMO.
OK

--
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 && X86_MCE && X86_THERMAL_VECTOR
 	select THERMAL_GOV_USER_SPACE
 	default m
 	help