[kernel] r19244 - in dists/sid/linux/debian/patches: . features/all/cpu-devices

[Ben Hutchings]

Author: benh
Date: Mon Jul  9 13:49:39 2012
New Revision: 19244

Log:
Add the missing piece of "x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM"

Added:
   dists/sid/linux/debian/patches/features/all/cpu-devices/x86-cpufeature-Rename-X86_FEATURE_DTS-to-X86_FEATURE.patch
Modified:
   dists/sid/linux/debian/patches/series

Added: dists/sid/linux/debian/patches/features/all/cpu-devices/x86-cpufeature-Rename-X86_FEATURE_DTS-to-X86_FEATURE.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/x86-cpufeature-Rename-X86_FEATURE_DTS-to-X86_FEATURE.patch	Mon Jul  9 13:49:39 2012	(r19244)
@@ -0,0 +1,35 @@
+From: "H. Peter Anvin" <hpa at linux.intel.com>
+Date: Fri, 22 Jun 2012 10:58:06 -0700
+Subject: 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 at linux-fr.org>
+Link: http://lkml.kernel.org/r/4FE34BCB.5050305@linux.intel.com
+Cc: Jan Beulich <JBeulich at suse.com>
+Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
+[bwh: Most of this was applied in 3.2.22; just apply the device table change
+ which didn't belong there]
+---
+--- a/drivers/hwmon/coretemp.c
++++ b/drivers/hwmon/coretemp.c
+@@ -762,7 +762,7 @@ static struct notifier_block coretemp_cp
+ };
+ 
+ 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);

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Jul  9 13:42:47 2012	(r19243)
+++ dists/sid/linux/debian/patches/series	Mon Jul  9 13:49:39 2012	(r19244)
@@ -347,6 +347,7 @@
 features/all/cpu-devices/tracing-mm-Move-include-of-trace-events-kmem.h-out-o.patch
 features/all/cpu-devices/driver-core-remove-__must_check-from-device_create_f.patch
 features/all/cpu-devices/sh-Fix-up-store-queue-code-for-subsys_interface-chan.patch
+features/all/cpu-devices/x86-cpufeature-Rename-X86_FEATURE_DTS-to-X86_FEATURE.patch
 
 features/arm/kirkwood-add-dreamplug-fdt-support.patch
 features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch