[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] linux headers: sync to 5.9-rc7
From: |
Peter Maydell |
Subject: |
[PULL 06/12] linux headers: sync to 5.9-rc7 |
Date: |
Thu, 8 Oct 2020 15:25:51 +0100 |
From: Andrew Jones <drjones@redhat.com>
Update against Linux 5.9-rc7.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Message-id: 20201001061718.101915-2-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-headers/linux/kvm.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 6683e2e1b0a..43580c767c3 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt {
#define KVM_VM_PPC_HV 1
#define KVM_VM_PPC_PR 2
-/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */
-#define KVM_VM_MIPS_TE 0
+/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */
+#define KVM_VM_MIPS_AUTO 0
#define KVM_VM_MIPS_VZ 1
+#define KVM_VM_MIPS_TE 2
#define KVM_S390_SIE_PAGE_OFFSET 1
@@ -1035,6 +1036,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_LAST_CPU 184
#define KVM_CAP_SMALLER_MAXPHYADDR 185
#define KVM_CAP_S390_DIAG318 186
+#define KVM_CAP_STEAL_TIME 187
#ifdef KVM_CAP_IRQ_ROUTING
--
2.20.1
- [PULL 00/12] target-arm queue, Peter Maydell, 2020/10/08
- [PULL 03/12] hw/arm/sbsa-ref : Fix SMMUv3 Initialisation, Peter Maydell, 2020/10/08
- [PULL 01/12] hw/ssi/npcm7xx_fiu: Fix handling of unsigned integer, Peter Maydell, 2020/10/08
- [PULL 06/12] linux headers: sync to 5.9-rc7,
Peter Maydell <=
- [PULL 02/12] hw/arm/fsl-imx25: Fix a typo, Peter Maydell, 2020/10/08
- [PULL 04/12] hw/arm/sbsa-ref : allocate IRQs for SMMUv3, Peter Maydell, 2020/10/08
- [PULL 08/12] hw/arm/virt: Move post cpu realize check into its own function, Peter Maydell, 2020/10/08
- [PULL 07/12] target/arm/kvm: Make uncalled stubs explicitly unreachable, Peter Maydell, 2020/10/08
- [PULL 05/12] hw/char/bcm2835_aux: Allow less than 32-bit accesses, Peter Maydell, 2020/10/08
- [PULL 09/12] hw/arm/virt: Move kvm pmu setup to virt_cpu_post_init, Peter Maydell, 2020/10/08
- [PULL 10/12] tests/qtest: Restore aarch64 arm-cpu-features test, Peter Maydell, 2020/10/08
- [PULL 11/12] hw/arm/virt: Implement kvm-steal-time, Peter Maydell, 2020/10/08
- [PULL 12/12] target/arm: Make '-cpu max' have a 48-bit PA, Peter Maydell, 2020/10/08