Re: [Xen-devel] [PATCH] pv drivers: wrap xen_cpuid_base()

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 23.01.12 at 14:49, Olaf Hering <olaf@xxxxxxxxx> wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@xxxxxxxxx>
> # Date 1327325262 -3600
> # Node ID 88bddf1f0bafade6431651c5257bd02780596579
> # Parent  80fdf2182bc62ca358ba2f1a3513b47a4f8d9dfd
> pv drivers: wrap xen_cpuid_base()
> 
> Allow compilation of PVonHVM drivers with forward-ported xenlinux
> sources in openSuSE 12.1.  xen_cpuid_base() is now in mainline, the copy
> in the xen tree leads to a compilation error.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> 
> diff -r 80fdf2182bc6 -r 88bddf1f0baf 
> unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
> @@ -118,6 +118,7 @@ unsigned long alloc_xen_mmio(unsigned lo
>  
>  #ifndef __ia64__
>  
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)

Given that the PV drivers must be building fine for SLE11 SP2, which
is 3.0-based, I wonder if this really is the correct fix (and doesn't
rather break the build). The first thing coming to mind is that
arch/x86/include/asm/xen/hypervisor.h shouldn't get included here
(and hence there shouldn't be any conflict). Are you perhaps trying
to build the PV drivers against a pv-ops-enabled configuration (which
is a wrong to try afaict)?

Jan

>  static uint32_t xen_cpuid_base(void)
>  {
>       uint32_t base, eax, ebx, ecx, edx;
> @@ -136,6 +137,7 @@ static uint32_t xen_cpuid_base(void)
>  
>       return 0;
>  }
> +#endif
>  
>  static int init_hypercall_stubs(void)
>  {
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx 
> http://lists.xensource.com/xen-devel 




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel