diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-03-16 11:34:14 +0100 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-03-16 11:34:14 +0100 |
| commit | 3b2b46d747bc5e3a56a87fc4d5611b649c716ccd (patch) | |
| tree | 5ccc4feb499ac11951425f3c67307189b6da3ac8 /unmodified_drivers | |
| parent | ad99fd8cce837ea846a61aab89104929535d19a8 (diff) | |
| download | xen-3b2b46d747bc5e3a56a87fc4d5611b649c716ccd.tar.gz xen-3b2b46d747bc5e3a56a87fc4d5611b649c716ccd.tar.bz2 xen-3b2b46d747bc5e3a56a87fc4d5611b649c716ccd.zip | |
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>
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index 759a0d1cae..f36179ffe5 100644 --- 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 long len) #ifndef __ia64__ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) 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) { |