diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 20:10:13 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 20:10:13 +0400 |
| commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
| tree | de83ac171d51bbe7621110c3145a68c198b13711 /arch/x86/include/uapi/asm/msr-index.h | |
| parent | 296f3f2c9322480400338f71d8c118107f9a7f20 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.xz | |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'arch/x86/include/uapi/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index 892ce40a7470..7a060f4b411f 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -44,6 +44,7 @@ #define SNB_C1_AUTO_UNDEMOTE (1UL << 27) #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) +#define MSR_PLATFORM_INFO 0x000000ce #define MSR_MTRRcap 0x000000fe #define MSR_IA32_BBL_CR_CTL 0x00000119 #define MSR_IA32_BBL_CR_CTL3 0x0000011e |