git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
msr-index.h
diff --git
a/arch/x86/include/asm/msr-index.h
b/arch/x86/include/asm/msr-index.h
index f9324851eba03971ec46e1a5a437bb041ba0088a..b49d8ca228f6ffe743e19d0423c676e62b1d29df 100644
(file)
--- a/
arch/x86/include/asm/msr-index.h
+++ b/
arch/x86/include/asm/msr-index.h
@@
-236,6
+236,8
@@
#define MSR_IA32_MISC_ENABLE 0x000001a0
+#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2
+
/* MISC_ENABLE bits: architectural */
#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << 0)
#define MSR_IA32_MISC_ENABLE_TCC (1ULL << 1)