Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad33411 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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.

    a4659053 x86/hwmon: fix initialization of coretemp

Reported-by: default avatarJean 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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c15acff3

arch/x86/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ 
#define X86_FEATURE_XSAVEOPT	(7*32+ 4) /* Optimized Xsave */

#define X86_FEATURE_PLN		(7*32+ 5) /* Intel Power Limit Notification */

#define X86_FEATURE_PTS		(7*32+ 6) /* Intel Package Thermal Status */

#define X86_FEATURE_DTS		(7*32+ 7) /* Digital Thermal Sensor */

#define X86_FEATURE_DTHERM	(7*32+ 7) /* Digital Thermal Sensor */

#define X86_FEATURE_HW_PSTATE	(7*32+ 8) /* AMD HW-PState */



/* Virtualization flags: Linux defined, word 8 */

arch/x86/kernel/cpu/scattered.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
	const struct cpuid_bit *cb;



	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {

		{ X86_FEATURE_DTS,		CR_EAX, 0, 0x00000006, 0 },

		{ X86_FEATURE_DTHERM,		CR_EAX, 0, 0x00000006, 0 },

		{ X86_FEATURE_IDA,		CR_EAX, 1, 0x00000006, 0 },

		{ X86_FEATURE_ARAT,		CR_EAX, 2, 0x00000006, 0 },

		{ X86_FEATURE_PLN,		CR_EAX, 4, 0x00000006, 0 },

drivers/hwmon/coretemp.c

+2 −2
Original line number Diff line number Diff line
@@ -664,7 +664,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) {
@@ -765,7 +765,7 @@ static struct notifier_block coretemp_cpu_notifier __refdata = { 
};



static const struct x86_cpu_id coretemp_ids[] = {

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },

	{}

};

MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);