Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756931Ab0FDCK2 (ORCPT ); Thu, 3 Jun 2010 22:10:28 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:47402 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755901Ab0FDCK1 (ORCPT ); Thu, 3 Jun 2010 22:10:27 -0400 Date: Thu, 3 Jun 2010 19:10:23 -0700 From: Andrew Morton To: Dave Young Cc: linux-kernel@vger.kernel.org, Len Brown , pm list , Thomas Renninger Subject: Re: mmotm 2010-06-03-16-36 uploaded Message-Id: <20100603191023.96d74346.akpm@linux-foundation.org> In-Reply-To: References: <201006040005.o5405Afw023296@imap1.linux-foundation.org> <20100603185401.1851c94e.akpm@linux-foundation.org> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2242 Lines: 59 On Fri, 4 Jun 2010 10:02:57 +0800 Dave Young wrote: > On Fri, Jun 4, 2010 at 9:54 AM, Andrew Morton wrote: > > On Fri, 4 Jun 2010 09:41:58 +0800 Dave Young wrote: > > > >> On Fri, Jun 4, 2010 at 7:36 AM, __ wrote: > >> > The mm-of-the-moment snapshot 2010-06-03-16-36 has been uploaded to > >> > > >> > __ http://userweb.kernel.org/~akpm/mmotm/ > >> > > >> > >> Hi, intel_idle build fails: > >> > >> drivers/idle/intel_idle.c: In function ___intel_idle___: > >> drivers/idle/intel_idle.c:234: error: too few arguments to function ___trace_power > >> _start___ > >> make[2]: *** [drivers/idle/intel_idle.o] Error 1 > >> make[1]: *** [drivers/idle] Error 2 > >> make[1]: *** Waiting for unfinished jobs.... > >> > > > > Caused by > > x86-cpufreq-make-trace_power_frequency-cpufreq-driver-independent.patch > > which changed trace_power_start(). > > > > drivers/idle/intel_idle.c wasn't there when Thomas wrote that patch. > > > > this, I guess: > > > > --- a/drivers/idle/intel_idle.c~x86-cpufreq-make-trace_power_frequency-cpufreq-driver-independent-fix > > +++ a/drivers/idle/intel_idle.c > > @@ -231,7 +231,7 @@ static int intel_idle(struct cpuidle_dev > > > > __ __ __ __stop_critical_timings(); > > __#ifndef MODULE > > - __ __ __ trace_power_start(POWER_CSTATE, (eax >> 4) + 1); > > + __ __ __ trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); > > __#endif > > __ __ __ __if (!need_resched()) { > > > > With one more param "cpu", fails with "too many arguments": > > CC drivers/idle/intel_idle.o > drivers/idle/intel_idle.c: In function ___intel_idle___: > drivers/idle/intel_idle.c:234: error: too many arguments to function > ___trace_power_start___ > make[2]: *** [drivers/idle/intel_idle.o] Error 1 > make[1]: *** [drivers/idle] Error 2 > make[1]: *** Waiting for unfinished jobs.... hm, It Works For Me. I suspect you applied my patch to mainline, not to -mm. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/