powerpc/pseries: add new branch prediction security bits for link stack

[linux-2.6-microblaze.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 2f4ee0a..633c45e 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -519,9 +519,15 @@ static void init_cpu_char_feature_flags(struct h_cpu_char_result *result)
        if (result->character & H_CPU_CHAR_BCCTR_FLUSH_ASSIST)
                security_ftr_set(SEC_FTR_BCCTR_FLUSH_ASSIST);
 
+       if (result->character & H_CPU_CHAR_BCCTR_LINK_FLUSH_ASSIST)
+               security_ftr_set(SEC_FTR_BCCTR_LINK_FLUSH_ASSIST);
+
        if (result->behaviour & H_CPU_BEHAV_FLUSH_COUNT_CACHE)
                security_ftr_set(SEC_FTR_FLUSH_COUNT_CACHE);
 
+       if (result->behaviour & H_CPU_BEHAV_FLUSH_LINK_STACK)
+               security_ftr_set(SEC_FTR_FLUSH_LINK_STACK);
+
        /*
         * The features below are enabled by default, so we instead look to see
         * if firmware has *disabled* them, and clear them if so.