Subject: Re: linux-next: Tree for November 22 (kvm)

From: Randy Dunlap <[email-masked]>
Date: Fri, 10 Dec 2010 09:18:59 -0800

On Mon, 29 Nov 2010 08:08:30 -1000 Zachary Amsden wrote:

> On 11/29/2010 07:52 AM, Randy Dunlap wrote:
> > On 11/29/10 09:47, Zachary Amsden wrote:
> >    
> >> On 11/29/2010 06:35 AM, Avi Kivity wrote:
> >>      
> >>> On 11/29/2010 06:33 PM, Randy Dunlap wrote:
> >>>        
> >>>> On Mon, 22 Nov 2010 13:26:27 -0800 Randy Dunlap wrote:
> >>>>
> >>>>          
> >>>>>   On Mon, 22 Nov 2010 13:49:11 +1100 Stephen Rothwell wrote:
> >>>>>
> >>>>>            
> >>>>>>   Hi all,
> >>>>>>
> >>>>>>   Changes since 20101119:
> >>>>>>              
> >>>>>
> >>>>>   kvm.c:(.init.text+0x11f49): undefined reference to
> >>>>>            
> >>>> `kvm_register_clock'
> >>>>          
> >>>>>   when CONFIG_KVM_CLOCK is not enabled.
> >>>>>            
> >>>>
> >>>> BUild error still present in linux-next-2010-NOV-29.
> >>>>
> >>>>          
> >>> Glauber, Zach?
> >>>
> >>>        
> >> I can only speculate this reference is being called from smpboot without
> >> CONFIG guarding?
> >>      
> > Sorry, looks like I dropped the first line of the error messages:
> >
> > arch/x86/built-in.o: In function `kvm_smp_prepare_boot_cpu':
> > kvm.c:(.init.text+0xad38): undefined reference to `kvm_register_clock'
> >
> > from arch/x86/kernel/kvm.c:
> >
> > #ifdef CONFIG_SMP
> > static void __init kvm_smp_prepare_boot_cpu(void)
> > {
> > 	WARN_ON(kvm_register_clock("primary cpu clock"));
> > 	kvm_guest_cpu_init();
> > 	native_smp_prepare_boot_cpu();
> > }
> >
> > so it looks like you are correct...
> >    
> 
> Looks like this is the appropriate fix:
> 
> #ifdef CONFIG_SMP
> static void __init kvm_smp_prepare_boot_cpu(void)
> {
> #ifdef CONFIG_KVM_CLOCK
> 	WARN_ON(kvm_register_clock("primary cpu clock"));
> #endif
> 	kvm_guest_cpu_init();
> 	native_smp_prepare_boot_cpu();
> }

Can we get this fix merged, please?

Build error is still happening in linux-next 20101210.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***