Commit 99adcd9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Add p4-clockmod sysfs-ui removal to feature-removal schedule.
  Revert "[CPUFREQ] Disable sysfs ui for p4-clockmod."
parents 2d5516cb 753b7aea

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -335,3 +335,12 @@ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net" 
	Secmark, it is time to deprecate the older mechanism and start the

	process of removing the old code.

Who:	Paul Moore <paul.moore@hp.com>

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



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and

	e088e4c9cdb618675874becb91b2fd581ee707e6.

	Removal is subject to fixing any remaining bugs in ACPI which may

	cause the thermal throttling not to happen at the right time.

Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>

arch/x86/kernel/cpu/cpufreq/p4-clockmod.c

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ static struct cpufreq_driver p4clockmod_driver = { 
	.name		= "p4-clockmod",

	.owner		= THIS_MODULE,

	.attr		= p4clockmod_attr,

	.hide_interface	= 1,

};

drivers/cpufreq/cpufreq.c

+18 −33
Original line number Diff line number Diff line
@@ -754,11 +754,6 @@ static struct kobj_type ktype_cpufreq = { 
	.release	= cpufreq_sysfs_release,

};



static struct kobj_type ktype_empty_cpufreq = {

	.sysfs_ops	= &sysfs_ops,

	.release	= cpufreq_sysfs_release,

};





/**

 * cpufreq_add_dev - add a CPU device
@@ -892,36 +887,26 @@ static int cpufreq_add_dev(struct sys_device *sys_dev) 
	memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));



	/* prepare interface data */

	if (!cpufreq_driver->hide_interface) {

		ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,

					   &sys_dev->kobj, "cpufreq");

	ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, &sys_dev->kobj,

				   "cpufreq");

	if (ret)

		goto err_out_driver_exit;



	/* set up files for this cpu device */

	drv_attr = cpufreq_driver->attr;

	while ((drv_attr) && (*drv_attr)) {

			ret = sysfs_create_file(&policy->kobj,

						&((*drv_attr)->attr));

		ret = sysfs_create_file(&policy->kobj, &((*drv_attr)->attr));

		if (ret)

			goto err_out_driver_exit;

		drv_attr++;

	}

	if (cpufreq_driver->get) {

			ret = sysfs_create_file(&policy->kobj,

						&cpuinfo_cur_freq.attr);

		ret = sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr);

		if (ret)

			goto err_out_driver_exit;

	}

	if (cpufreq_driver->target) {

			ret = sysfs_create_file(&policy->kobj,

						&scaling_cur_freq.attr);

			if (ret)

				goto err_out_driver_exit;

		}

	} else {

		ret = kobject_init_and_add(&policy->kobj, &ktype_empty_cpufreq,

					   &sys_dev->kobj, "cpufreq");

		ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr);

		if (ret)

			goto err_out_driver_exit;

	}

include/linux/cpufreq.h

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ struct cpufreq_driver { 
	int	(*suspend)	(struct cpufreq_policy *policy, pm_message_t pmsg);

	int	(*resume)	(struct cpufreq_policy *policy);

	struct freq_attr	**attr;

	bool			hide_interface;

};



/* flags */