diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-06-22 10:58:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 08:47:51 -0700 |
| commit | c8d210c8900b8e4f495c15b4e6238552921eb65c (patch) | |
| tree | 3641e6e58756bbabeeed900ac88e0153c70f779d /drivers/hwmon | |
| parent | 665bcdee8212277aecfb0095cddfd0f864d7f7b2 (diff) | |
| download | kernel_samsung_smdk4412-c8d210c8900b8e4f495c15b4e6238552921eb65c.zip kernel_samsung_smdk4412-c8d210c8900b8e4f495c15b4e6238552921eb65c.tar.gz kernel_samsung_smdk4412-c8d210c8900b8e4f495c15b4e6238552921eb65c.tar.bz2 | |
x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM
commit 4ad33411308596f2f918603509729922a1ec4411 upstream.
It makes sense to label "Digital Thermal Sensor" as "DTS", but
unfortunately the string "dts" was already used for "Debug Store", and
/proc/cpuinfo is a user space ABI.
Therefore, rename this to "dtherm".
This conflict went into mainline via the hwmon tree without any x86
maintainer ack, and without any kind of hint in the subject.
a4659053 x86/hwmon: fix initialization of coretemp
Reported-by: Jean Delvare <khali@linux-fr.org>
Link: http://lkml.kernel.org/r/4FE34BCB.5050305@linux.intel.com
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
[bwh: Backported to 3.2: drop the coretemp device table change]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 3cf2353..252defd 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -709,7 +709,7 @@ static void __cpuinit get_core_online(unsigned int cpu) * sensors. We check this bit only, all the early CPUs * without thermal sensors will be filtered out. */ - if (!cpu_has(c, X86_FEATURE_DTS)) + if (!cpu_has(c, X86_FEATURE_DTHERM)) return; if (!pdev) { |