Messages in this thread | | | Date | Mon, 14 Dec 2009 15:35:28 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: rr tree build failure |
| |
Hi Rusty,
On Fri, 11 Dec 2009 12:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next build (x86_64 allmodconfig) failed like this: > > arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_target': > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: error: implicit declaration of function 'tsk_cpumask' > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: warning: passing argument 2 of 'cpumask_copy' makes pointer from integer without a cast > include/linux/cpumask.h:466: note: expected 'const struct cpumask *' but argument is of type 'int' > > Caused by commit 9dd4c5ab546fcac98cfb9ca24ed5cc1bf7f08334 > ("cpumask:tsk_cpus_allowed-not-tsk_cpumask") from the rr tree interacting > with commit b8cbe7e82ec8b55d7bbdde66fc69e788fde00dc6 ("[CPUFREQ] cpumask: > don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c") from > the cpufreq tree.
The cpufreq patch above is now in Linus' tree, so You should add the patch below to your tree (or squash it into the affected patch).
> I have applied this merge fix up patch and can carry it as necessary: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Fri, 11 Dec 2009 12:21:00 +1100 > Subject: [PATCH] rr: cpufreq: fix up for api name change > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > index a9df944..f125e5c 100644 > --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c > @@ -1136,7 +1136,7 @@ static int powernowk8_target(struct cpufreq_policy *pol, > if (!alloc_cpumask_var(&oldmask, GFP_KERNEL)) > return -ENOMEM; > > - cpumask_copy(oldmask, tsk_cpumask(current)); > + cpumask_copy(oldmask, tsk_cpus_allowed(current)); > set_cpus_allowed_ptr(current, cpumask_of(pol->cpu)); > > if (smp_processor_id() != pol->cpu) {
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |