diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
| commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
| tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /arch/x86/kvm/lapic.c | |
| parent | 27a0a90d6301dd883a748538e4db692a5fb923e1 (diff) | |
| parent | 652521d460cbfa24ef27717b4b28acfac4281be6 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 87b0fcc23ef8..b29d00b661ff 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -111,11 +111,6 @@ static inline int apic_enabled(struct kvm_lapic *apic) (LVT_MASK | APIC_MODE_MASK | APIC_INPUT_POLARITY | \ APIC_LVT_REMOTE_IRR | APIC_LVT_LEVEL_TRIGGER) -static inline u8 kvm_xapic_id(struct kvm_lapic *apic) -{ - return kvm_lapic_get_reg(apic, APIC_ID) >> 24; -} - static inline u32 kvm_x2apic_id(struct kvm_lapic *apic) { return apic->vcpu->vcpu_id; |