diff options
author | 2015-03-04 06:35:43 +0100 | |
---|---|---|
committer | 2015-03-04 06:35:43 +0100 | |
commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /arch/x86/include/asm/special_insns.h | |
parent | x86/compat: Remove sys32_vm86_warning (diff) | |
parent | Linux 4.0-rc2 (diff) | |
download | wireguard-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.xz wireguard-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.zip |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/special_insns.h')
-rw-r--r-- | arch/x86/include/asm/special_insns.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h index 096250143832..2ec1a5392542 100644 --- a/arch/x86/include/asm/special_insns.h +++ b/arch/x86/include/asm/special_insns.h @@ -139,17 +139,17 @@ static inline void write_cr3(unsigned long x) native_write_cr3(x); } -static inline unsigned long read_cr4(void) +static inline unsigned long __read_cr4(void) { return native_read_cr4(); } -static inline unsigned long read_cr4_safe(void) +static inline unsigned long __read_cr4_safe(void) { return native_read_cr4_safe(); } -static inline void write_cr4(unsigned long x) +static inline void __write_cr4(unsigned long x) { native_write_cr4(x); } |