Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[deliverable/linux.git] / include / linux / cpufreq.h

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 4064cfcfbffdb442f62c7cdb4d6ade7c3d61c0f0..718e8725de8aa4d1d13004af368c8585e4f655a4 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -80,7 +80,6 @@ struct cpufreq_policy {
        unsigned int            last_policy; /* policy before unplug */
        struct cpufreq_governor *governor; /* see below */
        void                    *governor_data;
-       bool                    governor_enabled; /* governor start/stop flag */
        char                    last_governor[CPUFREQ_NAME_LEN]; /* last governor used */
 
        struct work_struct      update; /* if update_policy() needs to be
@@ -100,10 +99,6 @@ struct cpufreq_policy {
         * - Any routine that will write to the policy structure and/or may take away
         *   the policy altogether (eg. CPU hotplug), will hold this lock in write
         *   mode before doing so.
-        *
-        * Additional rules:
-        * - Lock should not be held across
-        *     __cpufreq_governor(data, CPUFREQ_GOV_POLICY_EXIT);
         */
        struct rw_semaphore     rwsem;