From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756145AbZC3Az7 (ORCPT ); Sun, 29 Mar 2009 20:55:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754898AbZC3Azt (ORCPT ); Sun, 29 Mar 2009 20:55:49 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:47970 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753631AbZC3Azs (ORCPT ); Sun, 29 Mar 2009 20:55:48 -0400 Date: Mon, 30 Mar 2009 11:55:41 +1100 From: Stephen Rothwell To: Linus , Andrew Morton Cc: linux-next@vger.kernel.org, LKML , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: linux-next: origin tree build failure Message-Id: <20090330115541.eb051c80.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.14.7; i486-pc-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 Hi all, Today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/kernel/cpu/cpufreq/p4-clockmod.c: In function 'cpufreq_p4_cpu_init': arch/x86/kernel/cpu/cpufreq/p4-clockmod.c:232: error: implicit declaration of function 'recalibrate_cpu_khz' Caused by a mismerge or arch/x86/include/asm/timer.h in 6e15cf04860074ad032e88c306bea656bbdd0f22 ("Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2") which then propogated back into Linus' tree. I applied the following patch. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ From: Stephen Rothwell Date: Mon, 30 Mar 2009 11:10:27 +1100 Subject: [PATCH] x86: fix mismerge in arch/x86/include/asm/timer.h Signed-off-by: Stephen Rothwell --- arch/x86/include/asm/timer.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index a81195e..bd37ed4 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -12,9 +12,9 @@ unsigned long native_calibrate_tsc(void); #ifdef CONFIG_X86_32 extern int timer_ack; -extern int recalibrate_cpu_khz(void); extern irqreturn_t timer_interrupt(int irq, void *dev_id); #endif /* CONFIG_X86_32 */ +extern int recalibrate_cpu_khz(void); extern int no_timer_check; -- 1.6.2.1