diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-08-20 23:37:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-15 09:47:02 +0200 |
| commit | 838ddbf08cc724778431c927aa0f8c2c2ad4501e (patch) | |
| tree | 0ce4cb6037d29a13176e0eace5041c0d44245783 /arch/x86/kvm/x86.c | |
| parent | d9b47449c1a17be65332e07c1e8acba0f8b27e10 (diff) | |
| download | linux-stable-838ddbf08cc724778431c927aa0f8c2c2ad4501e.tar.gz linux-stable-838ddbf08cc724778431c927aa0f8c2c2ad4501e.tar.bz2 linux-stable-838ddbf08cc724778431c927aa0f8c2c2ad4501e.zip | |
x86: kvm: avoid unused variable warning
commit 7288bde1f9df6c1475675419bdd7725ce84dec56 upstream.
Removing one of the two accesses of the maxphyaddr variable led to
a harmless warning:
arch/x86/kvm/x86.c: In function 'kvm_set_mmio_spte_mask':
arch/x86/kvm/x86.c:6563:6: error: unused variable 'maxphyaddr' [-Werror=unused-variable]
Removing the #ifdef seems to be the nicest workaround, as it
makes the code look cleaner than adding another #ifdef.
Fixes: 28a1f3ac1d0c ("kvm: x86: Set highest physical address bits in non-present/reserved SPTEs")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: stable@vger.kernel.org # L1TF
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6e5626822743..94cd63081471 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6516,14 +6516,12 @@ static void kvm_set_mmio_spte_mask(void) /* Set the present bit. */ mask |= 1ull; -#ifdef CONFIG_X86_64 /* * If reserved bit is not supported, clear the present bit to disable * mmio page fault. */ - if (maxphyaddr == 52) + if (IS_ENABLED(CONFIG_X86_64) && maxphyaddr == 52) mask &= ~1ull; -#endif kvm_mmu_set_mmio_spte_mask(mask, mask); } |