diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 19:53:33 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 19:54:48 +0800 |
| commit | cd1fe2006b62234455a91e428bad45331dc79250 (patch) | |
| tree | 5fca3d52a0d3f6edbb4352d6b54f3155d7e2c100 /arch/x86/include/asm/msr-index.h | |
| parent | 824ce96ff92c399f5bd2ee308f231300e7e89174 (diff) | |
| parent | 6fdbca2f35ee3e80079b31a5cda7bb6fec8def39 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.02-rt
Conflicts:
lsk has current_stack_pointer and arch_within_stack_frames
in arch/x86/include/asm/thread_info.h
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 37db36fddc88..b8911aecf035 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -330,6 +330,9 @@ #define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL #define FAM10H_MMIO_CONF_BASE_SHIFT 20 #define MSR_FAM10H_NODE_ID 0xc001100c +#define MSR_F10H_DECFG 0xc0011029 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT 1 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE BIT_ULL(MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT) /* K8 MSRs */ #define MSR_K8_TOP_MEM1 0xc001001a |