Commit ad2e62a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Remove unneeded errata workaround from p4-clockmod.
  [CPUFREQ] check sysfs_create_link return value
parents 51e6ed23 3453c847

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

+0 −9
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ enum { 




static int has_N44_O17_errata[NR_CPUS];

static int has_N60_errata[NR_CPUS];

static unsigned int stock_freq;

static struct cpufreq_driver p4clockmod_driver;

static unsigned int cpufreq_p4_get(unsigned int cpu);
@@ -224,12 +223,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) 
	case 0x0f12:

		has_N44_O17_errata[policy->cpu] = 1;

		dprintk("has errata -- disabling low frequencies\n");

		break;



	case 0x0f29:

		has_N60_errata[policy->cpu] = 1;

		dprintk("has errata -- disabling frequencies lower than 2ghz\n");

		break;

	}



	/* get max frequency */
@@ -241,8 +234,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) 
	for (i=1; (p4clockmod_table[i].frequency != CPUFREQ_TABLE_END); i++) {

		if ((i<2) && (has_N44_O17_errata[policy->cpu]))

			p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID;

		else if (has_N60_errata[policy->cpu] && ((stock_freq * i)/8) < 2000000)

			p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID;

		else

			p4clockmod_table[i].frequency = (stock_freq * i)/8;

	}

drivers/cpufreq/cpufreq.c

+13 −4
Original line number Diff line number Diff line
@@ -722,8 +722,13 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 
			spin_unlock_irqrestore(&cpufreq_driver_lock, flags);



			dprintk("CPU already managed, adding link\n");

			sysfs_create_link(&sys_dev->kobj,

					  &managed_policy->kobj, "cpufreq");

			ret = sysfs_create_link(&sys_dev->kobj,

						&managed_policy->kobj,

						"cpufreq");

			if (ret) {

				mutex_unlock(&policy->lock);

				goto err_out_driver_exit;

			}



			cpufreq_debug_enable_ratelimit();

			mutex_unlock(&policy->lock);
@@ -770,8 +775,12 @@ static int cpufreq_add_dev (struct sys_device * sys_dev) 
		dprintk("CPU %u already managed, adding link\n", j);

		cpufreq_cpu_get(cpu);

		cpu_sys_dev = get_cpu_sysdev(j);

		sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,

		ret = sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,

					"cpufreq");

		if (ret) {

			mutex_unlock(&policy->lock);

			goto err_out_unregister;

		}

	}



	policy->governor = NULL; /* to assure that the starting sequence is