Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ef46fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] pcc-cpufreq: remove duplicate statements
  [CPUFREQ] Remove the pm_message_t argument from driver suspend
  [CPUFREQ] Remove unneeded locks
  [CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
  [CPUFREQ] Remove deprecated sysfs file sampling_rate_max
  [CPUFREQ] powernow-k8: The table index is not worth displaying
  [CPUFREQ] calculate delay after dbs_check_cpu
  [CPUFREQ] Add documentation for sampling_down_factor
  [CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
parents 77aa56ba bdce2595

Documentation/cpu-freq/governors.txt

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ intensive calculation on your laptop that you do not care how long it 
takes to complete as you can 'nice' it and prevent it from taking part

in the deciding process of whether to increase your CPU frequency.



sampling_down_factor: this parameter controls the rate at which the

kernel makes a decision on when to decrease the frequency while running

at top speed. When set to 1 (the default) decisions to reevaluate load

are made at the same interval regardless of current clock speed. But

when set to greater than 1 (e.g. 100) it acts as a multiplier for the

scheduling interval for reevaluating load when the CPU is at its top

speed due to high load. This improves performance by reducing the overhead

of load evaluation and helping the CPU stay at its top speed when truly

busy, rather than shifting back and forth in speed. This tunable has no

effect on behavior at lower speeds/lower CPU loads.





2.5 Conservative

----------------

arch/arm/mach-s5pv210/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, 
}



#ifdef CONFIG_PM

static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy,

				   pm_message_t pmsg)

static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy)

{

	return 0;

}

arch/arm/mach-s5pv310/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -458,8 +458,7 @@ static int s5pv310_target(struct cpufreq_policy *policy, 
}



#ifdef CONFIG_PM

static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy,

				   pm_message_t pmsg)

static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy)

{

	return 0;

}

arch/arm/plat-s3c24xx/cpu-freq.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int s3c_cpufreq_verify(struct cpufreq_policy *policy) 
static struct cpufreq_frequency_table suspend_pll;

static unsigned int suspend_freq;



static int s3c_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)

static int s3c_cpufreq_suspend(struct cpufreq_policy *policy)

{

	suspend_pll.frequency = clk_get_rate(_clk_mpll);

	suspend_pll.index = __raw_readl(S3C2410_MPLLCON);

arch/powerpc/platforms/powermac/cpufreq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static u32 read_gpio(struct device_node *np) 
	return offset;

}



static int pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)

static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)

{

	/* Ok, this could be made a bit smarter, but let's be robust for now. We

	 * always force a speed change to high speed before sleep, to make sure