* [PATCH -next] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
[not found] ` <51BF46C3.3090900@linux.intel.com>
@ 2013-06-17 17:55 ` Randy Dunlap
2013-06-17 18:09 ` Srinivas Pandruvada
0 siblings, 1 reply; 8+ messages in thread
From: Randy Dunlap @ 2013-06-17 17:55 UTC (permalink / raw)
To: Srinivas Pandruvada
Cc: Stephen Rothwell, linux-next, linux-kernel, Zhang Rui,
Linux PM list
On 06/17/13 10:26, Srinivas Pandruvada wrote:
> On 06/17/2013 10:03 AM, Randy Dunlap wrote:
>> On 06/17/13 01:51, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20130607:
>>>
>>
>> on i386 and x86_64:
>>
>> when built as loadable module:
>>
>> 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!
>>
>> or when built-in:
>>
>> drivers/built-in.o: In function `pkg_temp_thermal_init':
>> x86_pkg_temp_thermal.c:(.init.text+0x1492b): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.init.text+0x14936): undefined reference to `platform_thermal_package_rate_control'
>> x86_pkg_temp_thermal.c:(.init.text+0x150fe): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.init.text+0x15109): undefined reference to `platform_thermal_package_rate_control'
>> drivers/built-in.o: In function `pkg_temp_thermal_exit':
>> x86_pkg_temp_thermal.c:(.exit.text+0x3a9b): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.exit.text+0x3aa6): undefined reference to `platform_thermal_package_rate_control'
>>
>>
>> Full randconfig file is attached (for loadable module build).
>>
>>
>>
>
> This requires CONFIG_X86_MCE, which is by default is set to "y".
But you can't rely on that symbol being enabled -- there needs to be some
enforcement of it, like the patch below.
---
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
select THERMAL_GOV_USER_SPACE
default m
help
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH -next] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 17:55 ` [PATCH -next] thermal: fix x86_pkg_temp_thermal.c build and Kconfig Randy Dunlap
@ 2013-06-17 18:09 ` Srinivas Pandruvada
2013-06-17 18:12 ` [PATCH -next v2] " Randy Dunlap
0 siblings, 1 reply; 8+ messages in thread
From: Srinivas Pandruvada @ 2013-06-17 18:09 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, Zhang Rui,
Linux PM list
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
Thanks,
Srinivas
On 06/17/2013 10:55 AM, Randy Dunlap wrote:
> On 06/17/13 10:26, Srinivas Pandruvada wrote:
>> On 06/17/2013 10:03 AM, Randy Dunlap wrote:
>>> On 06/17/13 01:51, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20130607:
>>>>
>>> on i386 and x86_64:
>>>
>>> when built as loadable module:
>>>
>>> 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!
>>>
>>> or when built-in:
>>>
>>> drivers/built-in.o: In function `pkg_temp_thermal_init':
>>> x86_pkg_temp_thermal.c:(.init.text+0x1492b): undefined reference to `platform_thermal_package_notify'
>>> x86_pkg_temp_thermal.c:(.init.text+0x14936): undefined reference to `platform_thermal_package_rate_control'
>>> x86_pkg_temp_thermal.c:(.init.text+0x150fe): undefined reference to `platform_thermal_package_notify'
>>> x86_pkg_temp_thermal.c:(.init.text+0x15109): undefined reference to `platform_thermal_package_rate_control'
>>> drivers/built-in.o: In function `pkg_temp_thermal_exit':
>>> x86_pkg_temp_thermal.c:(.exit.text+0x3a9b): undefined reference to `platform_thermal_package_notify'
>>> x86_pkg_temp_thermal.c:(.exit.text+0x3aa6): undefined reference to `platform_thermal_package_rate_control'
>>>
>>>
>>> Full randconfig file is attached (for loadable module build).
>>>
>>>
>>>
>> This requires CONFIG_X86_MCE, which is by default is set to "y".
> But you can't rely on that symbol being enabled -- there needs to be some
> enforcement of it, like the patch below.
>
>
> ---
> 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
depends on X86 && X86_MCE && X86_THERMAL_VECTOR
> select THERMAL_GOV_USER_SPACE
> default m
> help
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH -next v2] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 18:09 ` Srinivas Pandruvada
@ 2013-06-17 18:12 ` Randy Dunlap
2013-06-17 18:17 ` Borislav Petkov
0 siblings, 1 reply; 8+ messages in thread
From: Randy Dunlap @ 2013-06-17 18:12 UTC (permalink / raw)
To: Srinivas Pandruvada
Cc: Stephen Rothwell, linux-next, linux-kernel, Zhang Rui,
Linux PM list
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
select THERMAL_GOV_USER_SPACE
default m
help
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH -next v2] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 18:12 ` [PATCH -next v2] " Randy Dunlap
@ 2013-06-17 18:17 ` Borislav Petkov
2013-06-17 18:31 ` Srinivas Pandruvada
2013-06-17 19:27 ` [PATCH -next v3] " Randy Dunlap
0 siblings, 2 replies; 8+ messages in thread
From: Borislav Petkov @ 2013-06-17 18:17 UTC (permalink / raw)
To: Randy Dunlap
Cc: Srinivas Pandruvada, Stephen Rothwell, linux-next, linux-kernel,
Zhang Rui, Linux PM list
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.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH -next v2] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 18:17 ` Borislav Petkov
@ 2013-06-17 18:31 ` Srinivas Pandruvada
2013-06-17 19:27 ` [PATCH -next v3] " Randy Dunlap
1 sibling, 0 replies; 8+ messages in thread
From: Srinivas Pandruvada @ 2013-06-17 18:31 UTC (permalink / raw)
To: Borislav Petkov
Cc: Randy Dunlap, Stephen Rothwell, linux-next, linux-kernel,
Zhang Rui, Linux PM list
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH -next v3] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 18:17 ` Borislav Petkov
2013-06-17 18:31 ` Srinivas Pandruvada
@ 2013-06-17 19:27 ` Randy Dunlap
2013-06-17 19:45 ` Borislav Petkov
1 sibling, 1 reply; 8+ messages in thread
From: Randy Dunlap @ 2013-06-17 19:27 UTC (permalink / raw)
To: Borislav Petkov
Cc: Srinivas Pandruvada, Stephen Rothwell, linux-next, linux-kernel,
Zhang Rui, Linux PM list
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH -next v3] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 19:27 ` [PATCH -next v3] " Randy Dunlap
@ 2013-06-17 19:45 ` Borislav Petkov
2013-06-17 23:28 ` Zhang Rui
0 siblings, 1 reply; 8+ messages in thread
From: Borislav Petkov @ 2013-06-17 19:45 UTC (permalink / raw)
To: Randy Dunlap
Cc: Srinivas Pandruvada, Stephen Rothwell, linux-next, linux-kernel,
Zhang Rui, Linux PM list
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>
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH -next v3] thermal: fix x86_pkg_temp_thermal.c build and Kconfig
2013-06-17 19:45 ` Borislav Petkov
@ 2013-06-17 23:28 ` Zhang Rui
0 siblings, 0 replies; 8+ messages in thread
From: Zhang Rui @ 2013-06-17 23:28 UTC (permalink / raw)
To: Borislav Petkov
Cc: Randy Dunlap, Srinivas Pandruvada, Stephen Rothwell, linux-next,
linux-kernel, Linux PM list
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-06-17 23:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130617185106.5950ffbf4b96acd9b2b2c834@canb.auug.org.au>
[not found] ` <51BF4159.1000004@infradead.org>
[not found] ` <51BF46C3.3090900@linux.intel.com>
2013-06-17 17:55 ` [PATCH -next] thermal: fix x86_pkg_temp_thermal.c build and Kconfig Randy Dunlap
2013-06-17 18:09 ` Srinivas Pandruvada
2013-06-17 18:12 ` [PATCH -next v2] " Randy Dunlap
2013-06-17 18:17 ` Borislav Petkov
2013-06-17 18:31 ` Srinivas Pandruvada
2013-06-17 19:27 ` [PATCH -next v3] " Randy Dunlap
2013-06-17 19:45 ` Borislav Petkov
2013-06-17 23:28 ` Zhang Rui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).