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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 16:04:22 +0000 (09:04 -0700)
commit3f616017b684a5faf29b7a6b7b100209357136e4
tree386b2c6a9c29e4d31d614c4177bc3ad206b4b791
parent174d58573117bc688e9481c8f7392bd1ddf24fcf
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/cpu/scattered.c
drivers/hwmon/coretemp.c