diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-11-17 11:52:49 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-05 11:26:32 +0100 |
| commit | 47b35d190b4676953a5ce25572e031d842264194 (patch) | |
| tree | 97500fd79613b6c6d7581ddb940a845b26845e8f /arch | |
| parent | bb98bd9733b5b54b0de67e171b0057dcc6fb98de (diff) | |
| download | linux-stable-47b35d190b4676953a5ce25572e031d842264194.tar.gz linux-stable-47b35d190b4676953a5ce25572e031d842264194.tar.bz2 linux-stable-47b35d190b4676953a5ce25572e031d842264194.zip | |
KVM: lapic: Split out x2apic ldr calculation
commit e872fa94662d0644057c7c80b3071bdb9249e5ab upstream.
Split out the ldr calculation from kvm_apic_set_x2apic_id
since we're about to reuse it in the following patch.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 36c90d631096..4991e9e51611 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -266,9 +266,14 @@ static inline void kvm_apic_set_ldr(struct kvm_lapic *apic, u32 id) recalculate_apic_map(apic->vcpu->kvm); } +static inline u32 kvm_apic_calc_x2apic_ldr(u32 id) +{ + return ((id >> 4) << 16) | (1 << (id & 0xf)); +} + static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id) { - u32 ldr = ((id >> 4) << 16) | (1 << (id & 0xf)); + u32 ldr = kvm_apic_calc_x2apic_ldr(id); WARN_ON_ONCE(id != apic->vcpu->vcpu_id); |