fix up x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch

diff --git a/queue-5.10/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-5.10/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index 28d72d5689d08440aef7ea2d75e05395ec560cfe..10b226f4a39f754bfaf33273ef76aff701eeac5d 100644 (file)
--- a/queue-5.10/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-5.10/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define X86_FEATURE_VIRT_SSBD         (13*32+25) /* Virtualized Speculative Store Bypass Disable */
  #define X86_FEATURE_AMD_SSB_NO                (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */
  #define X86_FEATURE_BTC_NO            (13*32+29) /* "" Not vulnerable to Branch Type Confusion */
-+#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* IBPB clears return address predictor */
++#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* "" IBPB clears return address predictor */
  
  /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
  #define X86_FEATURE_DTHERM            (14*32+ 0) /* Digital Thermal Sensor */

diff --git a/queue-5.15/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-5.15/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index e3b43269eef6f7857580b47579abe166896826b0..389c95059f755b7e81472269cc8b8e2fa4c12f3c 100644 (file)
--- a/queue-5.15/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-5.15/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define X86_FEATURE_VIRT_SSBD         (13*32+25) /* Virtualized Speculative Store Bypass Disable */
  #define X86_FEATURE_AMD_SSB_NO                (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */
  #define X86_FEATURE_BTC_NO            (13*32+29) /* "" Not vulnerable to Branch Type Confusion */
-+#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* IBPB clears return address predictor */
++#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* "" IBPB clears return address predictor */
  
  /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
  #define X86_FEATURE_DTHERM            (14*32+ 0) /* Digital Thermal Sensor */

diff --git a/queue-6.1/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-6.1/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index 4b778af595ce1eec834a3ad15dabda5a5dce7891..3bd597a019a0d666f278ce0f389a0a6d0acb9ecb 100644 (file)
--- a/queue-6.1/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-6.1/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define X86_FEATURE_AMD_SSB_NO                (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */
  #define X86_FEATURE_CPPC              (13*32+27) /* Collaborative Processor Performance Control */
  #define X86_FEATURE_BTC_NO            (13*32+29) /* "" Not vulnerable to Branch Type Confusion */
-+#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* IBPB clears return address predictor */
++#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* "" IBPB clears return address predictor */
  #define X86_FEATURE_BRS                       (13*32+31) /* Branch Sampling available */
  
  /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */

diff --git a/queue-6.6/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-6.6/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index 916760038c2a556ad3be11b19540331dbee5c71d..04e724730a9038d5e80fb13634840f934b6a322e 100644 (file)
--- a/queue-6.6/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-6.6/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define X86_FEATURE_CPPC              (13*32+27) /* Collaborative Processor Performance Control */
  #define X86_FEATURE_AMD_PSFD            (13*32+28) /* "" Predictive Store Forwarding Disable */
  #define X86_FEATURE_BTC_NO            (13*32+29) /* "" Not vulnerable to Branch Type Confusion */
-+#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* IBPB clears return address predictor */
++#define X86_FEATURE_AMD_IBPB_RET      (13*32+30) /* "" IBPB clears return address predictor */
  #define X86_FEATURE_BRS                       (13*32+31) /* Branch Sampling available */
  
  /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */