diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 09:11:43 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 09:11:46 +0200 |
commit | ed859ed3b0f9893c6bce3708e8928341c15699b9 (patch) | |
tree | 59c507f00bc13becb4accdd64fdc01ece08b4645 /arch/x86/include/asm/cpufeature.h | |
parent | a8027073eb127cd207070891374b5c54c2ce3d23 (diff) | |
parent | 53eeb64e808971207350386121f4bab12fa2f45f (diff) | |
download | kernel_samsung_smdk4412-ed859ed3b0f9893c6bce3708e8928341c15699b9.tar.gz kernel_samsung_smdk4412-ed859ed3b0f9893c6bce3708e8928341c15699b9.tar.bz2 kernel_samsung_smdk4412-ed859ed3b0f9893c6bce3708e8928341c15699b9.zip |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/cpufeature.h')
-rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index c6fbb7b430d..3f76523589a 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -168,6 +168,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 */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW (8*32+ 0) /* Intel TPR Shadow */ |