diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2023-12-23 02:05:07 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-12-23 02:05:07 +0300 |
commit | ef5b28372c565128bdce7a59bc78402a8ce68e1b (patch) | |
tree | 77f549fcf73f8400a34e7a5d51548fafd1533644 /arch/x86/include/asm/ia32.h | |
parent | 5c2b2176ead1911d652b8848169bb44bdde75ca8 (diff) | |
parent | 4ad9843e1ea088bd2529290234c6c4c6374836a7 (diff) | |
download | linux-ef5b28372c565128bdce7a59bc78402a8ce68e1b.tar.xz |
Merge tag 'kvm-riscv-fixes-6.7-1' of https://github.com/kvm-riscv/linux into kvm-master
KVM/riscv fixes for 6.7, take #1
- Fix a race condition in updating external interrupt for
trap-n-emulated IMSIC swfile
- Fix print_reg defaults in get-reg-list selftest
Diffstat (limited to 'arch/x86/include/asm/ia32.h')
-rw-r--r-- | arch/x86/include/asm/ia32.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h index 5a2ae24b1204..9805629479d9 100644 --- a/arch/x86/include/asm/ia32.h +++ b/arch/x86/include/asm/ia32.h @@ -75,6 +75,11 @@ static inline bool ia32_enabled(void) return __ia32_enabled; } +static inline void ia32_disable(void) +{ + __ia32_enabled = false; +} + #else /* !CONFIG_IA32_EMULATION */ static inline bool ia32_enabled(void) @@ -82,6 +87,8 @@ static inline bool ia32_enabled(void) return IS_ENABLED(CONFIG_X86_32); } +static inline void ia32_disable(void) {} + #endif #endif /* _ASM_X86_IA32_H */ |