Subject: Re: linux-next: Tree for June 29 (kvm)

From: "Michael S. Tsirkin" <[email-masked]>
Date: Sun, 1 Jul 2012 13:56:44 +0300

On Sun, Jul 01, 2012 at 12:49:53PM +0300, Avi Kivity wrote:
> On 07/01/2012 12:44 PM, Michael S. Tsirkin wrote:
> > On Sun, Jul 01, 2012 at 12:41:45PM +0300, Avi Kivity wrote:
> >> On 06/29/2012 09:05 PM, Randy Dunlap wrote:
> >> > On 06/29/2012 12:53 AM, Stephen Rothwell wrote:
> >> > 
> >> >> Hi all,
> >> >> 
> >> >> Changes since 20120628:
> >> > 
> >> > 
> >> > 
> >> > on i386:
> >> > 
> >> > arch/x86/built-in.o: In function `kvm_guest_apic_eoi_write':
> >> > kvm.c:(.text+0x3561f): undefined reference to `apic'
> >> > 
> >> > 
> >> > Full randconfig file is attached.
> >> 
> >> Michael, please disable pveoi if built with no apic.
> > 
> > Will do.
> > How do I tweak config to test this? Any hints?
> 
> See the original mail, there's a .config there.

This https://lkml.org/lkml/2012/6/29/40 ?
I don't see a .config there.

> Basically, i386 UP with
> IOAPIC disabled.

The following patch fixes this in another way:
making sure that anyone looking at apicdrivers
gets an empty list. Thoughts?

Signed-off-by: Michael S. Tsirkin <[email-masked]>

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index eaff479..e48547b 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -417,7 +417,12 @@ extern struct apic *apic;
 	__aligned(sizeof(struct apic *))				\
 	__section(.apicdrivers) = { &sym1, &sym2 }
 
+#ifdef CONFIG_X86_LOCAL_APIC
 extern struct apic *__apicdrivers[], *__apicdrivers_end[];
+#else
+#define __apicdrivers ((struct apic **)NULL)
+#define __apicdrivers_end ((struct apic **)NULL)
+#endif
 
 /*
  * APIC functionality to boot other CPUs - only used on SMP:

> -- 
> error compiling committee.c: too many arguments to function
>