Messages in this thread | | | Date | Fri, 25 Jan 2013 10:20:32 +0100 | From | Ingo Molnar <> | Subject | Re: [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu |
| |
* Borislav Petkov <bp@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
| |