800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
|
|
@@ -3,3 +3,4 @@ include $(M)/overrides.mk
|
|
obj-m += xen-vbd.o
|
|
|
|
xen-vbd-objs := blkfront.o vbd.o
|
|
+xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c)))
|
|
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
@@ -123,6 +123,7 @@ unsigned long alloc_xen_mmio(unsigned lo
|
|
|
|
#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;
|
|
@@ -141,6 +142,7 @@ static uint32_t xen_cpuid_base(void)
|
|
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
static int init_hypercall_stubs(void)
|
|
{
|