diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
commit | a66f9577c6e5280d83d45152aea29cf5e4548858 (patch) | |
tree | ebb42fa6ef16a535adbd5acb8cc79bdd2980da24 /arch/x86/include | |
parent | 26700159745df7db2bc75e8032d2a36913c37880 (diff) | |
parent | 2308e34317c8cc7beb03a3d18dc39d32015eff06 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/tlbflush.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 3142218e546f..6433e28dc9c8 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -32,7 +32,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate); /* Initialize cr4 shadow for this CPU. */ static inline void cr4_init_shadow(void) { - this_cpu_write(cpu_tlbstate.cr4, __read_cr4()); + this_cpu_write(cpu_tlbstate.cr4, __read_cr4_safe()); } /* Set in this cpu's CR4. */ |