From c9822dd26e9f5ab0ee5efb963e981109fe7814c3 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Mon, 12 Nov 2012 15:58:50 +0000 Subject: [PATCH] --- yaml --- r: 339286 b: refs/heads/master c: 3778ff5c709899a29cefe4b3077a926d0e1e9785 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/thermal/cpu_cooling.c | 2 +- trunk/include/linux/cpu_cooling.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65721a00313b..4f963778f49e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc1956b5f84de7d453ec4d9fe68385fffd689686 +refs/heads/master: 3778ff5c709899a29cefe4b3077a926d0e1e9785 diff --git a/trunk/drivers/thermal/cpu_cooling.c b/trunk/drivers/thermal/cpu_cooling.c index 6f94c2cac1f0..836828e29a87 100644 --- a/trunk/drivers/thermal/cpu_cooling.c +++ b/trunk/drivers/thermal/cpu_cooling.c @@ -313,7 +313,7 @@ static struct notifier_block thermal_cpufreq_notifier_block = { * @clip_cpus: cpumask of cpus where the frequency constraints will happen. */ struct thermal_cooling_device *cpufreq_cooling_register( - struct cpumask *clip_cpus) + const struct cpumask *clip_cpus) { struct thermal_cooling_device *cool_dev; struct cpufreq_cooling_device *cpufreq_dev = NULL; diff --git a/trunk/include/linux/cpu_cooling.h b/trunk/include/linux/cpu_cooling.h index 851530128e65..b30cc79c7a82 100644 --- a/trunk/include/linux/cpu_cooling.h +++ b/trunk/include/linux/cpu_cooling.h @@ -35,7 +35,7 @@ * @clip_cpus: cpumask of cpus where the frequency constraints will happen */ struct thermal_cooling_device *cpufreq_cooling_register( - struct cpumask *clip_cpus); + const struct cpumask *clip_cpus); /** * cpufreq_cooling_unregister - function to remove cpufreq cooling device. @@ -44,7 +44,7 @@ struct thermal_cooling_device *cpufreq_cooling_register( void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); #else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *cpufreq_cooling_register( - struct cpumask *clip_cpus) + const struct cpumask *clip_cpus) { return NULL; }