From e17dbf13217568064147332d7fe1f2cff0a27fd3 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 13 Aug 2007 15:49:46 -0600 Subject: [PATCH] --- yaml --- r: 64118 b: refs/heads/master c: 182fdd225de8fc3b1b721ae944fc41146a0bd812 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a12354d113a5..b049086cb69d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 352b0ef50d98049bf022a31eaf2272f52e2f5219 +refs/heads/master: 182fdd225de8fc3b1b721ae944fc41146a0bd812 diff --git a/trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c index 15c08d52f09f..8c6ec7070844 100644 --- a/trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c +++ b/trunk/arch/ia64/kernel/cpufreq/acpi-cpufreq.c @@ -113,10 +113,8 @@ processor_get_freq ( saved_mask = current->cpus_allowed; set_cpus_allowed(current, cpumask_of_cpu(cpu)); - if (smp_processor_id() != cpu) { - ret = -EAGAIN; + if (smp_processor_id() != cpu) goto migrate_end; - } /* processor_get_pstate gets the instantaneous frequency */ ret = processor_get_pstate(&value); @@ -125,7 +123,7 @@ processor_get_freq ( set_cpus_allowed(current, saved_mask); printk(KERN_WARNING "get performance failed with error %d\n", ret); - ret = -EAGAIN; + ret = 0; goto migrate_end; } clock_freq = extract_clock(data, value, cpu);