diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:57:49 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:57:49 -0800 |
| commit | f9c1bf30186d62087e475dd56eaf830692f504e8 (patch) | |
| tree | 1de48092c3baf68753321c4643ad6011a961c786 /kernel | |
| parent | 84dc474f3c33c4fbbe42f46876e0dde502e60ad0 (diff) | |
| parent | 37e461fc4453488c394ccdbdcb8e286c122b047a (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/cpufreq_sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/cpufreq_sched.c b/kernel/sched/cpufreq_sched.c index f6f9b9b3a4a8..d751bc2d0d6e 100644 --- a/kernel/sched/cpufreq_sched.c +++ b/kernel/sched/cpufreq_sched.c @@ -289,7 +289,7 @@ static int cpufreq_sched_policy_init(struct cpufreq_policy *policy) pr_debug("%s: throttle threshold = %u [ns]\n", __func__, gd->up_throttle_nsec); - rc = sysfs_create_group(get_governor_parent_kobj(policy), get_sysfs_attr()); + rc = sysfs_create_group(&policy->kobj, get_sysfs_attr()); if (rc) { pr_err("%s: couldn't create sysfs attributes: %d\n", __func__, rc); goto err; @@ -332,7 +332,7 @@ static int cpufreq_sched_policy_exit(struct cpufreq_policy *policy) put_task_struct(gd->task); } - sysfs_remove_group(get_governor_parent_kobj(policy), get_sysfs_attr()); + sysfs_remove_group(&policy->kobj, get_sysfs_attr()); policy->governor_data = NULL; |