Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / drivers / cpufreq / speedstep-centrino.c

diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 7d4a31571608524e75cfa71c35c5336dea485efa..21bb8860ab031455bac26a2aeaab288941997390 100644 (file)
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
            !cpu_has(cpu, X86_FEATURE_EST))
                return -ENODEV;
 
-       if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
-               centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
+       if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
+               pax_open_kernel();
+               *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
+               pax_close_kernel();
+       }
 
        if (policy->cpu != 0)
                return -ENODEV;