cpb is AMD's name for the dynamic overclocking present in their chips. Intel provide similar functionality, so add "boost" as an alias. In the long run we can then transition to using that rather than cpb. Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx> --- Documentation/cpu-freq/user-guide.txt | 5 +++++ drivers/cpufreq/acpi-cpufreq.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt index 04f6b32..a692d3f 100644 --- a/Documentation/cpu-freq/user-guide.txt +++ b/Documentation/cpu-freq/user-guide.txt @@ -214,6 +214,11 @@ bios_limit : If the BIOS tells the OS to limit a CPU to which can be detected through the generic thermal driver. +boost: Some CPUs support clocking themselves to above + their rated frequency depending on temperature + and power constraints. This file allows this + to be enabled or disabled. + If you have selected the "userspace" governor which allows you to set the CPU operating frequency to a specific value, you can read out the current frequency in diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 0a92277..30c66cc 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -172,11 +172,8 @@ static ssize_t show_cpb(struct cpufreq_policy *policy, char *buf) return sprintf(buf, "%u\n", cpb_state(cpu)); } -#define define_one_rw(_name) \ -static struct freq_attr _name = \ - __ATTR(_name, 0644, show_##_name, store_##_name) - -define_one_rw(cpb); +static struct freq_attr cpb = __ATTR(cpb, 0644, show_cpb, store_cpb); +static struct freq_attr boost = __ATTR(boost, 0644, show_cpb, store_cpb); static int check_est_cpu(unsigned int cpuid) { @@ -933,6 +930,7 @@ static int acpi_cpufreq_resume(struct cpufreq_policy *policy) static struct freq_attr *acpi_cpufreq_attr[] = { &cpufreq_freq_attr_scaling_available_freqs, &cpb, + &boost, NULL, }; -- 1.7.6 -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html