diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2019-02-22 13:52:30 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2019-02-22 13:52:30 +1100 |
| commit | 0a0c50f771f577b05f5a1ac9867d296d02a5e51c (patch) | |
| tree | a5ba65815e0c2563844e52947274c0bdf63a790b /arch/powerpc/kvm/book3s.c | |
| parent | 716cb1160819721c39f807e103d9c307dbca2cf4 (diff) | |
| parent | c3c7470c75566a077c8dc71dcf8f1948b8ddfab4 (diff) | |
| download | linux-0a0c50f771f577b05f5a1ac9867d296d02a5e51c.tar.bz2 | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code. These commits will be merged both via the KVM tree and the
powerpc tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 22a46c64536b..10c5579d20ce 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -195,6 +195,13 @@ void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec) } EXPORT_SYMBOL_GPL(kvmppc_book3s_queue_irqprio); +void kvmppc_core_queue_machine_check(struct kvm_vcpu *vcpu, ulong flags) +{ + /* might as well deliver this straight away */ + kvmppc_inject_interrupt(vcpu, BOOK3S_INTERRUPT_MACHINE_CHECK, flags); +} +EXPORT_SYMBOL_GPL(kvmppc_core_queue_machine_check); + void kvmppc_core_queue_program(struct kvm_vcpu *vcpu, ulong flags) { /* might as well deliver this straight away */ |