From df99f8fac090e150bf56c1d0e0e500c7b8ca5964 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 12 Dec 2012 15:31:37 +0800 Subject: [PATCH] --- yaml --- r: 339291 b: refs/heads/master c: 1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95 h: refs/heads/master i: 339289: 7fa07a6c663d0533e42e8fbe79921d6cce06f1d8 339287: b625dab5a0212365d8177df089e3d7ea7f31745f v: v3 --- [refs] | 2 +- trunk/drivers/thermal/step_wise.c | 2 +- trunk/include/linux/thermal.h | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f00a6faed4fd..f7f35936497b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d567c686aebc7140f73318ee250236bda39c04eb +refs/heads/master: 1f53ef17d3ed6c34868cc8e7aa7c1d351c2fdc95 diff --git a/trunk/drivers/thermal/step_wise.c b/trunk/drivers/thermal/step_wise.c index 1242cffed8b0..0cd5e9fbab1c 100644 --- a/trunk/drivers/thermal/step_wise.c +++ b/trunk/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/trunk/include/linux/thermal.h b/trunk/include/linux/thermal.h index 807f2146fe35..fe82022478e7 100644 --- a/trunk/include/linux/thermal.h +++ b/trunk/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;