fuzz cleanup

diff --git a/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch b/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
index f58ae866c4189815e8aeb5ccaa8dca8a102061df..0301ced4d82a87e4db5d8dbd95a31e44324d4274 100644 (file)
--- a/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
+++ b/queue-5.4/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
@@ -20,14 +20,12 @@ Signed-off-by: Marc Zyngier <maz@kernel.org>
 Link: https://lore.kernel.org/r/20200617105456.28245-1-steven.price@arm.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/kvm/reset.c | 10 +++++++---
+ arch/arm64/kvm/reset.c |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
-index f4a8ae9188275..784d485218ca1 100644
 --- a/arch/arm64/kvm/reset.c
 +++ b/arch/arm64/kvm/reset.c
-@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)
+@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struc
  int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
  {
        const struct kvm_regs *cpu_reset;
@@ -36,7 +34,7 @@ index f4a8ae9188275..784d485218ca1 100644
        bool loaded;
  
        /* Reset PMU outside of the non-preemptible section */
-@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
+@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu
  
        if (test_bit(KVM_ARM_VCPU_PTRAUTH_ADDRESS, vcpu->arch.features) ||
            test_bit(KVM_ARM_VCPU_PTRAUTH_GENERIC, vcpu->arch.features)) {
@@ -58,6 +56,3 @@ index f4a8ae9188275..784d485218ca1 100644
                        cpu_reset = &default_regs_reset32;
                } else {
                        cpu_reset = &default_regs_reset;
--- 
-2.25.1
-

diff --git a/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch b/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
index 8ef0db8149f174a8a39f4caf72691f175c622a9b..fe5defcba1637a871242fe2d6a4c3c82bea647ee 100644 (file)
--- a/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
+++ b/queue-5.7/kvm-arm64-fix-kvm_reset_vcpu-return-code-being-incor.patch
@@ -20,14 +20,12 @@ Signed-off-by: Marc Zyngier <maz@kernel.org>
 Link: https://lore.kernel.org/r/20200617105456.28245-1-steven.price@arm.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- arch/arm64/kvm/reset.c | 10 +++++++---
+ arch/arm64/kvm/reset.c |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
-index 30b7ea680f66c..ab76728e27426 100644
 --- a/arch/arm64/kvm/reset.c
 +++ b/arch/arm64/kvm/reset.c
-@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)
+@@ -258,7 +258,7 @@ static int kvm_vcpu_enable_ptrauth(struc
  int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
  {
        const struct kvm_regs *cpu_reset;
@@ -36,7 +34,7 @@ index 30b7ea680f66c..ab76728e27426 100644
        bool loaded;
  
        /* Reset PMU outside of the non-preemptible section */
-@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
+@@ -281,15 +281,19 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu
  
        if (test_bit(KVM_ARM_VCPU_PTRAUTH_ADDRESS, vcpu->arch.features) ||
            test_bit(KVM_ARM_VCPU_PTRAUTH_GENERIC, vcpu->arch.features)) {
@@ -58,6 +56,3 @@ index 30b7ea680f66c..ab76728e27426 100644
                        cpu_reset = &default_regs_reset32;
                } else {
                        cpu_reset = &default_regs_reset;
--- 
-2.25.1
-