fix up some arm64 patches to be bisectable

diff --git a/queue-5.10/arm64-add-percpu-vectors-for-el1.patch b/queue-5.10/arm64-add-percpu-vectors-for-el1.patch
index d049fe0e874c986abd483da6759f793200b6102f..0ffad3c90809dca5874f45f2a22a8575c785afef 100644 (file)
--- a/queue-5.10/arm64-add-percpu-vectors-for-el1.patch
+++ b/queue-5.10/arm64-add-percpu-vectors-for-el1.patch
@@ -24,11 +24,11 @@ Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
 Signed-off-by: James Morse <james.morse@arm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/arm64/include/asm/vectors.h |   29 ++++++++++++++++++++++++++++-
+ arch/arm64/include/asm/vectors.h |   27 +++++++++++++++++++++++++++
  arch/arm64/kernel/cpufeature.c   |   11 +++++++++++
  arch/arm64/kernel/entry.S        |   12 ++++++------
  arch/arm64/kvm/hyp/vhe/switch.c  |    9 +++++++--
- 4 files changed, 52 insertions(+), 9 deletions(-)
+ 4 files changed, 51 insertions(+), 8 deletions(-)
 
 --- a/arch/arm64/include/asm/vectors.h
 +++ b/arch/arm64/include/asm/vectors.h
@@ -48,13 +48,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /*
   * Note: the order of this enum corresponds to two arrays in entry.S:
   * tramp_vecs and __bp_harden_el1_vectors. By default the canonical
-@@ -29,6 +38,24 @@ enum arm64_bp_harden_el1_vectors {
-        * Remap the kernel before branching to the canonical vectors.
-        */
+@@ -31,4 +40,22 @@ enum arm64_bp_harden_el1_vectors {
        EL1_VECTOR_KPTI,
--+};
-+};
-+
+ };
+ 
 +/* The vectors to use on return from EL0. e.g. to remap the kernel */
 +DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
 +
@@ -72,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
 +      return __bp_harden_el1_vectors + SZ_2K * slot;
 +}
- 
++
  #endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c

diff --git a/queue-5.10/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch b/queue-5.10/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
index 998ddd2ab9f3996717439e10c779910540f8655c..d6c7c8135fd4393ce654ef5aecee6961a8dc3ffc 100644 (file)
--- a/queue-5.10/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
+++ b/queue-5.10/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * Remap the kernel before branching to the canonical vectors.
 +       */
 +      EL1_VECTOR_KPTI,
-++};
++};
 +
 +#endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/entry.S

diff --git a/queue-5.15/arm64-add-percpu-vectors-for-el1.patch b/queue-5.15/arm64-add-percpu-vectors-for-el1.patch
index b64a5c836f8de954ec02f362c3bbc20231e63292..f00aa84f52958d10677993bdd862138e355c94de 100644 (file)
--- a/queue-5.15/arm64-add-percpu-vectors-for-el1.patch
+++ b/queue-5.15/arm64-add-percpu-vectors-for-el1.patch
@@ -24,11 +24,11 @@ Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
 Signed-off-by: James Morse <james.morse@arm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/arm64/include/asm/vectors.h |   29 ++++++++++++++++++++++++++++-
+ arch/arm64/include/asm/vectors.h |   27 +++++++++++++++++++++++++++
  arch/arm64/kernel/cpufeature.c   |   11 +++++++++++
  arch/arm64/kernel/entry.S        |   12 ++++++------
  arch/arm64/kvm/hyp/vhe/switch.c  |    9 +++++++--
- 4 files changed, 52 insertions(+), 9 deletions(-)
+ 4 files changed, 51 insertions(+), 8 deletions(-)
 
 --- a/arch/arm64/include/asm/vectors.h
 +++ b/arch/arm64/include/asm/vectors.h
@@ -48,13 +48,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /*
   * Note: the order of this enum corresponds to two arrays in entry.S:
   * tramp_vecs and __bp_harden_el1_vectors. By default the canonical
-@@ -29,6 +38,24 @@ enum arm64_bp_harden_el1_vectors {
-        * Remap the kernel before branching to the canonical vectors.
-        */
+@@ -31,4 +40,22 @@ enum arm64_bp_harden_el1_vectors {
        EL1_VECTOR_KPTI,
--+};
-+};
-+
+ };
+ 
 +/* The vectors to use on return from EL0. e.g. to remap the kernel */
 +DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
 +
@@ -72,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
 +      return __bp_harden_el1_vectors + SZ_2K * slot;
 +}
- 
++
  #endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c

diff --git a/queue-5.15/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch b/queue-5.15/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
index 8baf527a0a1f3d28c7ff02282d9b747d54183545..8a766daae332d111c352f91fe153a437b7bc9ca1 100644 (file)
--- a/queue-5.15/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
+++ b/queue-5.15/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * Remap the kernel before branching to the canonical vectors.
 +       */
 +      EL1_VECTOR_KPTI,
-++};
++};
 +
 +#endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/entry.S

diff --git a/queue-5.16/arm64-add-percpu-vectors-for-el1.patch b/queue-5.16/arm64-add-percpu-vectors-for-el1.patch
index 9c16086f202937d0c5ca88aaa19016dd6c003670..e4ad9cbf79e84b565a5138c8eb13a54209059c5b 100644 (file)
--- a/queue-5.16/arm64-add-percpu-vectors-for-el1.patch
+++ b/queue-5.16/arm64-add-percpu-vectors-for-el1.patch
@@ -24,11 +24,11 @@ Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
 Signed-off-by: James Morse <james.morse@arm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/arm64/include/asm/vectors.h |   29 ++++++++++++++++++++++++++++-
+ arch/arm64/include/asm/vectors.h |   27 +++++++++++++++++++++++++++
  arch/arm64/kernel/cpufeature.c   |   11 +++++++++++
  arch/arm64/kernel/entry.S        |   12 ++++++------
  arch/arm64/kvm/hyp/vhe/switch.c  |    9 +++++++--
- 4 files changed, 52 insertions(+), 9 deletions(-)
+ 4 files changed, 51 insertions(+), 8 deletions(-)
 
 --- a/arch/arm64/include/asm/vectors.h
 +++ b/arch/arm64/include/asm/vectors.h
@@ -48,13 +48,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /*
   * Note: the order of this enum corresponds to two arrays in entry.S:
   * tramp_vecs and __bp_harden_el1_vectors. By default the canonical
-@@ -29,6 +38,24 @@ enum arm64_bp_harden_el1_vectors {
-        * Remap the kernel before branching to the canonical vectors.
-        */
+@@ -31,4 +40,22 @@ enum arm64_bp_harden_el1_vectors {
        EL1_VECTOR_KPTI,
--+};
-+};
-+
+ };
+ 
 +/* The vectors to use on return from EL0. e.g. to remap the kernel */
 +DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector);
 +
@@ -72,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
 +      return __bp_harden_el1_vectors + SZ_2K * slot;
 +}
- 
++
  #endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c

diff --git a/queue-5.16/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch b/queue-5.16/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
index 48faefb889ea1a8dbe8b3e38c249d6a7112d55d3..b87f7bb380d3cad49c554249ed5ce8692b2e0173 100644 (file)
--- a/queue-5.16/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
+++ b/queue-5.16/arm64-entry-add-vectors-that-have-the-bhb-mitigation-sequences.patch
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * Remap the kernel before branching to the canonical vectors.
 +       */
 +      EL1_VECTOR_KPTI,
-++};
++};
 +
 +#endif /* __ASM_VECTORS_H */
 --- a/arch/arm64/kernel/entry.S