fix up x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch for 4.14 and 5.4

diff --git a/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index 6ded88758989b963cf4a5b631e17264de61d0507..7025452c3495c1dd855024c7c0eb79e051f9216c 100644 (file)
--- a/queue-4.19/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-4.19/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.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch b/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
index 835af595850d1632a2004a5dcef949bc2e28cb8d..8820a367ecb02179160c2744751035999336ae00 100644 (file)
--- a/queue-5.4/x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+++ b/queue-5.4/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 */