Browse Source

Thermal: Fix DEFAULT_THERMAL_GOVERNOR

Fix DEFAULT_THERMAL_GOVERNOR to be consistant with the
default governor selected in kernel config file.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Zhang Rui 12 years ago
parent
commit
1f53ef17d3
2 changed files with 9 additions and 3 deletions
  1. 1 1
      drivers/thermal/step_wise.c
  2. 8 2
      include/linux/thermal.h

+ 1 - 1
drivers/thermal/step_wise.c

@@ -170,7 +170,7 @@ static int step_wise_throttle(struct thermal_zone_device *tz, int trip)
 }
 
 static struct thermal_governor thermal_gov_step_wise = {
-	.name		= DEFAULT_THERMAL_GOVERNOR,
+	.name		= "step_wise",
 	.throttle	= step_wise_throttle,
 	.owner		= THIS_MODULE,
 };

+ 8 - 2
include/linux/thermal.h

@@ -46,8 +46,14 @@
 #define THERMAL_GENL_VERSION                    0x01
 #define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_group"
 
-/* Default Thermal Governor: Does Linear Throttling */
-#define DEFAULT_THERMAL_GOVERNOR	"step_wise"
+/* Default Thermal Governor */
+#if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE)
+#define DEFAULT_THERMAL_GOVERNOR       "step_wise"
+#elif defined(CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE)
+#define DEFAULT_THERMAL_GOVERNOR       "fair_share"
+#elif defined(CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE)
+#define DEFAULT_THERMAL_GOVERNOR       "user_space"
+#endif
 
 struct thermal_zone_device;
 struct thermal_cooling_device;