* Borislav Petkov <b...@alien8.de> wrote:

> On Fri, Jan 25, 2013 at 09:21:26AM +0100, Ingo Molnar wrote:
> > 
> > So, these two patches, on top of -tip, produce:
> > 
> > vmw_balloon.c:(.init.text+0x8506): undefined reference to `x86_hyper'
> > vmw_balloon.c:(.init.text+0x850a): undefined reference to `x86_hyper_vmware'
> 
> Hmm, I somehow can't trigger it here. And the thing is, vmw_balloon.c is
> built only when CONFIG_VMWARE_BALLOON is set and that is not the case in
> this config.
> 
> [ ??? ]

Maybe it's related, but I had to resolve two conflicts when 
merging your two patches to tip:x86/cpu and then to tip:master - 
first in arch/x86/Kconfig, then in 
arch/x86/include/asm/hypervisor.h.

The second conflict looked harmless, due to:

  4cca6ea04d31 x86/apic: Allow x2apic without IR on VMware platform

Thanks,

        Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to