diff options
| author | Peter Maydell | 2014-10-10 15:55:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-10-10 15:55:29 +0200 |
| commit | b1d28ec6a7dbdaadda39d29322f0de694aeb0b74 (patch) | |
| tree | 140d0963a9a155976d2336daec81fffdbae1fc52 /linux-headers/asm-mips/kvm_para.h | |
| parent | kvm fix compilation with GCC 4.3.4 (diff) | |
| parent | s390x/virtio-ccw: fix vhost-scsi intialization (diff) | |
| download | qemu-b1d28ec6a7dbdaadda39d29322f0de694aeb0b74.tar.gz qemu-b1d28ec6a7dbdaadda39d29322f0de694aeb0b74.tar.xz qemu-b1d28ec6a7dbdaadda39d29322f0de694aeb0b74.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging
various s390x updates:
- cpu state handling in qemu and migration
- vhost-scsi-ccw bugfix
# gpg: Signature made Fri 10 Oct 2014 14:01:34 BST using RSA key ID C6F02FAF
# gpg: Can't check signature: public key not found
* remotes/cohuck/tags/s390x-20141010:
s390x/virtio-ccw: fix vhost-scsi intialization
s390x/migration: migrate CPU state
s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET
s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs
s390x/kvm: propagate s390 cpu state to kvm
s390x/kvm: proper use of the cpu states OPERATING and STOPPED
s390x/kvm: introduce proper states for s390 cpus
linux-headers: update to 3.17-rc7
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-mips/kvm_para.h')
| -rw-r--r-- | linux-headers/asm-mips/kvm_para.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux-headers/asm-mips/kvm_para.h b/linux-headers/asm-mips/kvm_para.h index 14fab8f0b9..dbb2464f3b 100644 --- a/linux-headers/asm-mips/kvm_para.h +++ b/linux-headers/asm-mips/kvm_para.h @@ -1 +1,5 @@ -#include <asm-generic/kvm_para.h> +#ifndef _ASM_MIPS_KVM_PARA_H +#define _ASM_MIPS_KVM_PARA_H + + +#endif /* _ASM_MIPS_KVM_PARA_H */ |