Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszere...

[firefly-linux-kernel-4.4.55.git] / include / linux / cpufreq.h

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 4d078cebafd2dd5f059c65bd75a683a81b80e15f..2ee4888c1f47f6cbdcc0c7d49e48cc74f7729e05 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -66,8 +66,6 @@ struct cpufreq_policy {
        unsigned int            shared_type; /* ACPI: ANY or ALL affected CPUs
                                                should set cpufreq */
        unsigned int            cpu;    /* cpu nr of CPU managing this policy */
-       unsigned int            last_cpu; /* cpu nr of previous CPU that managed
-                                          * this policy */
        struct clk              *clk;
        struct cpufreq_cpuinfo  cpuinfo;/* see above */
 
@@ -113,6 +111,9 @@ struct cpufreq_policy {
        wait_queue_head_t       transition_wait;
        struct task_struct      *transition_task; /* Task which is doing the transition */
 
+       /* cpufreq-stats */
+       struct cpufreq_stats    *stats;
+
        /* For cpufreq driver's internal use */
        void                    *driver_data;
 };
@@ -367,9 +368,8 @@ static inline void cpufreq_resume(void) {}
 #define CPUFREQ_INCOMPATIBLE           (1)
 #define CPUFREQ_NOTIFY                 (2)
 #define CPUFREQ_START                  (3)
-#define CPUFREQ_UPDATE_POLICY_CPU      (4)
-#define CPUFREQ_CREATE_POLICY          (5)
-#define CPUFREQ_REMOVE_POLICY          (6)
+#define CPUFREQ_CREATE_POLICY          (4)
+#define CPUFREQ_REMOVE_POLICY          (5)
 
 #ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);