[xen staging] x86: remove redundant XEN_SHSTK check from reinit_bsp_stack()

[patchbot@xxxxxxx]

commit c103bb8ad41aeffbbb990ac60a5b2b0da28c82fd
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Feb 29 08:20:46 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 29 08:20:46 2024 +0100

    x86: remove redundant XEN_SHSTK check from reinit_bsp_stack()
    
    As of 72d51813d631 ("x86: amend cpu_has_xen_{ibt,shstk}") this has been
    integrated into cpu_has_xen_shstk.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index e487591fe0..a21984b1cc 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -810,7 +810,7 @@ static void __init noreturn reinit_bsp_stack(void)
     if ( rc )
         panic("Error %d setting up PV root page table\n", rc);
 
-    if ( IS_ENABLED(CONFIG_XEN_SHSTK) && cpu_has_xen_shstk )
+    if ( cpu_has_xen_shstk )
     {
         wrmsrl(MSR_PL0_SSP,
                (unsigned long)stack + (PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 
8);
--
generated by git-patchbot for /home/xen/git/xen.git#staging