projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[linux-drm-fsl-dcu.git]
/
arch
/
x86
/
include
/
uapi
/
asm
/
msr-index.h
diff --git
a/arch/x86/include/uapi/asm/msr-index.h
b/arch/x86/include/uapi/asm/msr-index.h
index 940ed3fd889a743732891945b191f34cddc8e217..37813b5ddc37472dba6c64b8ff3f2508dc085de0 100644
(file)
--- a/
arch/x86/include/uapi/asm/msr-index.h
+++ b/
arch/x86/include/uapi/asm/msr-index.h
@@
-538,6
+538,7
@@
/* MSR_IA32_VMX_MISC bits */
#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29)
+#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE 0x1F
/* AMD-V MSRs */
#define MSR_VM_CR 0xc0010114