]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 22 Jun 2012 17:58:06 +0000 (10:58 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 4 Jul 2012 04:44:28 +0000 (05:44 +0100)
commit08c34214eb254df16580770bb100bf4c52c159af
treed5a5b903386627e1f2e4578e4c4991b2bcb80f3f
parent2a095a707c3ce005151ef2d31786508286c6d549
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>
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/scattered.c
drivers/hwmon/coretemp.c