--- v20
+++ v23
@@ -13,10 +13,10 @@
  2 files changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/arch/x86/kernel/cet.c b/arch/x86/kernel/cet.c
-index 164139e23fef..ca2dc6b35c4d 100644
+index 3361706ba950..34a26eb7f259 100644
 --- a/arch/x86/kernel/cet.c
 +++ b/arch/x86/kernel/cet.c
-@@ -295,6 +295,13 @@ void cet_restore_signal(struct sc_ext *sc_ext)
+@@ -300,6 +300,13 @@ void cet_restore_signal(struct sc_ext *sc_ext)
  		msr_val |= CET_SHSTK_EN;
  	}
  
@@ -30,7 +30,7 @@
  	if (test_thread_flag(TIF_NEED_FPU_LOAD))
  		cet_user_state->user_cet = msr_val;
  	else
-@@ -335,9 +342,24 @@ int cet_setup_signal(bool ia32, unsigned long rstor_addr, struct sc_ext *sc_ext)
+@@ -340,9 +347,24 @@ int cet_setup_signal(bool ia32, unsigned long rstor_addr, struct sc_ext *sc_ext)
  		sc_ext->ssp = new_ssp;
  	}