UBUNTU: SAUCE: rfi-flush: update plpar_get_cpu_characteristics() signature to upstream

[mirror_ubuntu-artful-kernel.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 06d9dc7fb2d96a0c967a14b3f74f54ed620cb571..74f4b0fe7decebf74f109d20ae8c3c351a4b190f 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -457,27 +457,28 @@ static void __init find_and_init_phbs(void)
 
 static void pSeries_setup_rfi_flush(void)
 {
-       unsigned long character, behaviour, rc;
+       struct h_cpu_char_result result;
        enum l1d_flush_type types;
        bool enable;
+       long rc;
 
        /* Enable by default */
        enable = true;
 
-       rc = plpar_get_cpu_characteristics(&character, &behaviour);
+       rc = plpar_get_cpu_characteristics(&result);
        if (rc == H_SUCCESS) {
                types = L1D_FLUSH_NONE;
 
-               if (character & H_CPU_CHAR_L1D_FLUSH_TRIG2)
+               if (result.character & H_CPU_CHAR_L1D_FLUSH_TRIG2)
                        types |= L1D_FLUSH_MTTRIG;
-               if (character & H_CPU_CHAR_L1D_FLUSH_ORI30)
+               if (result.character & H_CPU_CHAR_L1D_FLUSH_ORI30)
                        types |= L1D_FLUSH_ORI;
 
                /* Use fallback if nothing set in hcall */
                if (types == L1D_FLUSH_NONE)
                        types = L1D_FLUSH_FALLBACK;
 
-               if (!(behaviour & H_CPU_BEHAV_L1D_FLUSH_PR))
+               if (!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR))
                        enable = false;
        } else {
                /* Default to fallback if case hcall is not available */