You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] constify some data tables.
[CPUFREQ] constify cpufreq_driver where possible.
{rd,wr}msr_on_cpu SMP=n optimization
[CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR
rdmsr_on_cpu, wrmsr_on_cpu
[CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
This commit is contained in:
@@ -1752,7 +1752,7 @@ static struct notifier_block __cpuinitdata cpufreq_cpu_notifier =
|
||||
* (and isn't unregistered in the meantime).
|
||||
*
|
||||
*/
|
||||
int cpufreq_register_driver(struct cpufreq_driver *driver_data)
|
||||
int cpufreq_register_driver(const struct cpufreq_driver *driver_data)
|
||||
{
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
@@ -1817,7 +1817,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_driver);
|
||||
* Returns zero if successful, and -EINVAL if the cpufreq_driver is
|
||||
* currently not initialised.
|
||||
*/
|
||||
int cpufreq_unregister_driver(struct cpufreq_driver *driver)
|
||||
int cpufreq_unregister_driver(const struct cpufreq_driver *driver)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
|
||||
@@ -432,9 +432,6 @@ static void do_dbs_timer(struct work_struct *work)
|
||||
/* We want all CPUs to do sampling nearly on same jiffy */
|
||||
int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
|
||||
|
||||
/* Permit rescheduling of this work item */
|
||||
work_release(work);
|
||||
|
||||
delay -= jiffies % delay;
|
||||
|
||||
if (lock_policy_rwsem_write(cpu) < 0)
|
||||
@@ -473,7 +470,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
|
||||
dbs_info->enable = 1;
|
||||
ondemand_powersave_bias_init();
|
||||
dbs_info->sample_type = DBS_NORMAL_SAMPLE;
|
||||
INIT_DELAYED_WORK_NAR(&dbs_info->work, do_dbs_timer);
|
||||
INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);
|
||||
queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
|
||||
delay);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user