diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:47:43 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:47:43 -0400 |
| commit | a61257492af3103d8524f51d76869a6233c6b679 (patch) | |
| tree | f41dd08ca3e150fe5e7854c39ebc77a79de779b0 | |
| parent | 9c80b4466d6850d19e441a7cad079f7457ace2e4 (diff) | |
| download | longterm-queue-4.12-a61257492af3103d8524f51d76869a6233c6b679.tar.gz | |
KVM: arm refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-arm-arm64-Convert-kvm_host_cpu_state-to-a-static.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/queue/KVM-arm-arm64-Convert-kvm_host_cpu_state-to-a-static.patch b/queue/KVM-arm-arm64-Convert-kvm_host_cpu_state-to-a-static.patch index 4663e96..c29e7f3 100644 --- a/queue/KVM-arm-arm64-Convert-kvm_host_cpu_state-to-a-static.patch +++ b/queue/KVM-arm-arm64-Convert-kvm_host_cpu_state-to-a-static.patch @@ -1,4 +1,4 @@ -From 36989e7fd386a9a5822c48691473863f8fbb404d Mon Sep 17 00:00:00 2001 +From 8fd262175ac73389e00899127ae3756f061877e5 Mon Sep 17 00:00:00 2001 From: James Morse <james.morse@arm.com> Date: Mon, 8 Jan 2018 15:38:04 +0000 Subject: [PATCH] KVM: arm/arm64: Convert kvm_host_cpu_state to a static @@ -15,12 +15,13 @@ by making it a static allocation. Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c -index 2df6a5c42f77..2fc6009a766c 100644 +index 9e44ae9441ea..57892d5cc97d 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c -@@ -53,8 +53,8 @@ +@@ -51,8 +51,8 @@ __asm__(".arch_extension virt"); #endif @@ -30,7 +31,7 @@ index 2df6a5c42f77..2fc6009a766c 100644 /* Per-CPU variable containing the currently running vcpu. */ static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu); -@@ -354,7 +354,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) +@@ -351,7 +351,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) } vcpu->cpu = cpu; @@ -38,8 +39,8 @@ index 2df6a5c42f77..2fc6009a766c 100644 + vcpu->arch.host_cpu_context = this_cpu_ptr(&kvm_host_cpu_state); kvm_arm_set_running_vcpu(vcpu); - kvm_vgic_load(vcpu); -@@ -1272,19 +1272,8 @@ static inline void hyp_cpu_pm_exit(void) + +@@ -1224,19 +1224,8 @@ static inline void hyp_cpu_pm_exit(void) } #endif @@ -59,7 +60,7 @@ index 2df6a5c42f77..2fc6009a766c 100644 /* set size of VMID supported by CPU */ kvm_vmid_bits = kvm_get_vmid_bits(); kvm_info("%d-bit VMID\n", kvm_vmid_bits); -@@ -1426,7 +1415,7 @@ static int init_hyp_mode(void) +@@ -1387,7 +1376,7 @@ static int init_hyp_mode(void) for_each_possible_cpu(cpu) { kvm_cpu_context_t *cpu_ctxt; @@ -68,9 +69,9 @@ index 2df6a5c42f77..2fc6009a766c 100644 err = create_hyp_mappings(cpu_ctxt, cpu_ctxt + 1, PAGE_HYP); if (err) { -@@ -1550,7 +1539,6 @@ out_hyp: - if (!in_hyp_mode) - teardown_hyp_mode(); +@@ -1465,7 +1454,6 @@ int kvm_arch_init(void *opaque) + out_hyp: + teardown_hyp_mode(); out_err: - teardown_common_resources(); return err; |