diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-12-12 15:31:37 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2012-12-12 15:34:48 +0800 |
| commit | 1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95 (patch) | |
| tree | 1f26888dcdd55e44293124344c64a219b928958e | |
| parent | d567c686aebc7140f73318ee250236bda39c04eb (diff) | |
| download | linux-1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95.tar.gz linux-1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95.tar.bz2 linux-1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95.zip | |
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>
| -rw-r--r-- | drivers/thermal/step_wise.c | 2 | ||||
| -rw-r--r-- | include/linux/thermal.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index 1242cffed8b0..0cd5e9fbab1c 100644 --- a/drivers/thermal/step_wise.c +++ b/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, }; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 807f2146fe35..fe82022478e7 100644 --- a/include/linux/thermal.h +++ b/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; |