]> git.baikalelectronics.ru Git - kernel.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)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 25 Jun 2012 16:01:15 +0000 (09:01 -0700)
commit75122d587380a3d615e4cf361d52ae197433e4fd
tree6c0cf345db064544c6f205fadc589602076f18cd
parent7a1ef86f4aff1da3a5666f132e6e4ef456d91e49
x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM

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.

    3362c9e7 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>
Cc: <stable@vger.kernel.org> v2.6.36..v3.4
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/scattered.c
drivers/hwmon/coretemp.c