diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-24 12:41:07 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-09-15 16:51:46 +0300 |
| commit | 010050a86393703f43859a4704d2193be49126d6 (patch) | |
| tree | 5a4f5492ab9fc76033c5c9bf0cdf8dda344aa619 | |
| parent | aee045ed0a6b22100f4d5945ee2deb75db6a0dd5 (diff) | |
| download | linux-010050a86393703f43859a4704d2193be49126d6.tar.xz | |
x86/kvm: Always inline evmcs_write64()
vmlinux.o: warning: objtool: vmx_update_host_rsp()+0x64: call to evmcs_write64() leaves .noinstr.text section
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210624095148.126956644@infradead.org
| -rw-r--r-- | arch/x86/kvm/vmx/evmcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h index 152ab0aa82cf..16731d2cf231 100644 --- a/arch/x86/kvm/vmx/evmcs.h +++ b/arch/x86/kvm/vmx/evmcs.h @@ -93,7 +93,7 @@ static __always_inline int get_evmcs_offset(unsigned long field, return evmcs_field->offset; } -static inline void evmcs_write64(unsigned long field, u64 value) +static __always_inline void evmcs_write64(unsigned long field, u64 value) { u16 clean_field; int offset = get_evmcs_offset(field, &clean_field); @@ -183,7 +183,7 @@ static inline void evmcs_load(u64 phys_addr) __init void evmcs_sanitize_exec_ctrls(struct vmcs_config *vmcs_conf); #else /* !IS_ENABLED(CONFIG_HYPERV) */ -static inline void evmcs_write64(unsigned long field, u64 value) {} +static __always_inline void evmcs_write64(unsigned long field, u64 value) {} static inline void evmcs_write32(unsigned long field, u32 value) {} static inline void evmcs_write16(unsigned long field, u16 value) {} static inline u64 evmcs_read64(unsigned long field) { return 0; } |