debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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

svn path=/dists/sid/linux/; revision=19244
This commit is contained in:
Ben Hutchings 2012-07-09 13:49:39 +00:00
parent bfa25d48b7
commit 65a94ef6e2
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
debian/patches/features/all/cpu-devices/x86-cpufeature-Rename-X86_FEATURE_DTS-to-X86_FEATURE.patch vendored Normal file
View File

@ -0,0 +1,35 @@
From: "H. Peter Anvin" <hpa@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@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: 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);

1
debian/patches/series vendored
View File

@ -347,6 +347,7 @@ features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch
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