H. Peter Anvin c8d210c890 x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM ...

commit 4ad3341130 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: Backported to 3.2: drop the coretemp device table change]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-07-16 08:47:51 -07:00

..

mcheck

x86, MCE, AMD: Make APIC LVT thresholding interrupt optional

2012-06-17 11:23:12 -07:00

mtrr

x86, mtrr: lock stop machine during MTRR rendezvous sequence

2011-08-29 13:29:08 -07:00

.gitignore

Update .gitignore files for generated targets

2008-10-20 11:24:31 -07:00

amd.c

x86, amd: Do not enable ARAT feature on AMD processors below family 0x12

2011-05-26 10:38:30 -07:00

bugs_64.c

x86/cpu: Clean up various files a bit

2009-07-11 11:24:09 +02:00

bugs.c

x86 idle: deprecate "no-hlt" cmdline param

2011-05-29 03:39:16 -04:00

centaur.c

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

common.c

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

2011-05-29 11:18:09 -07:00

cpu.h

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-10-21 13:18:36 -07:00

cyrix.c

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

hypervisor.c

Introduce CONFIG_XEN_PVHVM compile option

2010-07-29 11:11:33 -07:00

intel_cacheinfo.c

x86/amd: Fix L1i and L2 cache sharing information for AMD family 15h processors

2012-02-29 16:34:27 -08:00

intel.c

x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message

2011-08-29 13:29:07 -07:00

Makefile

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

mkcapflags.pl

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

mshyperv.c

x86: Export the symbol ms_hyperv

2010-07-08 14:12:03 -07:00

perf_event_amd.c

perf/x86: Update event scheduling constraints for AMD family 15h models

2012-06-01 15:12:54 +08:00

perf_event_intel_ds.c

perf/x86: Fix PEBS instruction unwind

2011-12-09 08:52:44 -08:00

perf_event_intel_lbr.c

perf, x86: Clean up debugctlmsr bit definitions

2010-03-26 09:41:03 +01:00

perf_event_intel.c

perf, x86: Add model 45 SandyBridge support

2011-10-03 11:40:49 -07:00

perf_event_p4.c

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

2011-05-01 19:09:39 +02:00

perf_event_p6.c

perf, x86: Store perfctr msr addresses in config_base/event_base

2011-02-16 13:30:52 +01:00

perf_event.c

x86, perf: Check that current->mm is alive before getting user callchain

2011-10-03 11:40:09 -07:00

perfctr-watchdog.c

perf, x86: Add new AMD family 15h msrs to perfctr reservation code

2011-02-16 13:30:50 +01:00

powerflags.c

x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>

2008-08-27 19:23:22 -07:00

proc.c

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-09-14 07:57:32 -07:00

scattered.c

x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM

2012-07-16 08:47:51 -07:00

sched.c

sched: x86: Name old_perf in a unique way

2009-09-16 11:21:07 +02:00

topology.c

x86, cpu: Split addon_cpuid_features.c

2010-07-19 19:02:41 -07:00

transmeta.c

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes

2009-11-23 11:59:53 -08:00

umc.c

x86: move various CPU initialization objects into .cpuinit.rodata

2009-03-12 13:13:07 +01:00

vmware.c

x86: Fix common misspellings

2011-03-18 10:39:30 +01:00