diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-14 11:00:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-14 11:02:33 +0200 |
| commit | b11c3f59475f4bb57b967642f362ea846302dab1 (patch) | |
| tree | 38eb0dfb559e24e358e7f9b33727334a8c79b335 /arch/mips/kvm/locore.S | |
| parent | dca4d728773a2f48e999c8617524bbf8dee4807f (diff) | |
| parent | 6df82a7b88dc9b0b519765562b005ef9196d812a (diff) | |
Merge branch 'kvm-mips-fixes' into HEAD
Merge MIPS patches destined to both 4.7 and kvm/next, to avoid
unnecessary conflicts.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/mips/kvm/locore.S')
| -rw-r--r-- | arch/mips/kvm/locore.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S index 3ef03009de5f..828fcfc1cd7f 100644 --- a/arch/mips/kvm/locore.S +++ b/arch/mips/kvm/locore.S @@ -202,6 +202,7 @@ FEXPORT(__kvm_mips_load_k0k1) /* Jump to guest */ eret +EXPORT(__kvm_mips_vcpu_run_end) VECTOR(MIPSX(exception), unknown) /* Find out what mode we came from and jump to the proper handler. */ |