xcp-1.6-updates/xen-4.1.hg

changeset 23293:a427ff3fee5f

unmodified drivers: hide xen_cpuid_base() in version 2.6.38+

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. The current state leads
to a compile error:

/usr/src/packages/BUILD/xen-4.2.24547/non-dbg/obj/default/platform-pci/platform-pci.c:121:
error: redefinition of 'xen_cpuid_base'
/usr/src/linux-3.0.13-0.11/arch/x86/include/asm/xen/hypervisor.h:43:
error: previous definition of 'xen_cpuid_base' was here

The reason is that the kernel sources are searched before the xen
sources for asm/hypervisor.h:

/usr/src/linux-3.0.13-0.11/arch/x86/include/asm/hypervisor.h
/usr/src/packages/BUILD/xen-4.2.24547/non-dbg/obj/default/include/asm/hypervisor.h

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Jan Beulich <jbeulich@suse.com>
Committed-by: Jan Beulich <jbeulich@suse.com>
xen-unstable changeset: 25067:05768bd498f2
xen-unstable date: Fri Mar 16 11:34:14 2012 +0100
author Olaf Hering <olaf@aepfle.de>
date Mon May 14 16:50:03 2012 +0100 (2012-05-14)
parents 44161ecfcda3
children 0c84b48831c8
files unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Mon May 14 16:49:24 2012 +0100
     1.2 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c	Mon May 14 16:50:03 2012 +0100
     1.3 @@ -118,6 +118,7 @@ unsigned long alloc_xen_mmio(unsigned lo
     1.4  
     1.5  #ifndef __ia64__
     1.6  
     1.7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
     1.8  static uint32_t xen_cpuid_base(void)
     1.9  {
    1.10  	uint32_t base, eax, ebx, ecx, edx;
    1.11 @@ -136,6 +137,7 @@ static uint32_t xen_cpuid_base(void)
    1.12  
    1.13  	return 0;
    1.14  }
    1.15 +#endif
    1.16  
    1.17  static int init_hypercall_stubs(void)
    1.18  {