0e9e131edf
25242-x86_64-hotplug-compat-m2p.patch 25247-SVM-no-rdtsc-intercept.patch 25267-x86-text-unlikely.patch 25269-x86-vMCE-addr-misc-write.patch 25271-x86_64-IST-index.patch 25327-pvdrv-no-asm-system-h.patch - Upstream patches from Jan 25168-x86-memset-size.patch 25191-x86-tdt-delta-calculation.patch 25195-x86-cpuidle-C2-no-flush-or-bm-check.patch 25196-x86-HAP-PAT-sr.patch 25200-x86_64-trap-bounce-flags.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=189
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
|
|
@@ -40,7 +40,9 @@
|
|
#include <xen/platform-compat.h>
|
|
#endif
|
|
|
|
+#ifndef shared_info_area
|
|
void *shared_info_area;
|
|
+#endif
|
|
|
|
#define is_valid_evtchn(x) ((x) != 0)
|
|
#define evtchn_from_irq(x) (irq_evtchn[irq].evtchn)
|
|
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
|
|
@@ -76,7 +76,6 @@ static uint64_t callback_via;
|
|
static int __devinit init_xen_info(void)
|
|
{
|
|
struct xen_add_to_physmap xatp;
|
|
- extern void *shared_info_area;
|
|
|
|
#ifdef __ia64__
|
|
xencomm_initialize();
|
|
@@ -84,6 +83,7 @@ static int __devinit init_xen_info(void)
|
|
|
|
setup_xen_features();
|
|
|
|
+#ifndef shared_info_area
|
|
shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;
|
|
xatp.domid = DOMID_SELF;
|
|
xatp.idx = 0;
|
|
@@ -96,6 +96,11 @@ static int __devinit init_xen_info(void)
|
|
ioremap(shared_info_frame << PAGE_SHIFT, PAGE_SIZE);
|
|
if (shared_info_area == NULL)
|
|
panic("can't map shared info\n");
|
|
+#else
|
|
+ shared_info_frame = __pa(shared_info_area) >> PAGE_SHIFT;
|
|
+ printk(KERN_INFO "Using kernel provided shared info (pfn=%lx)\n",
|
|
+ shared_info_frame);
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
+++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
|
|
@@ -27,6 +27,11 @@
|
|
unsigned long alloc_xen_mmio(unsigned long len);
|
|
void platform_pci_resume(void);
|
|
|
|
+#ifdef CONFIG_ENLIGHTEN_SPINLOCKS
|
|
+#define shared_info_area xen_shared_info
|
|
+#endif
|
|
+extern void *shared_info_area;
|
|
+
|
|
extern struct pci_dev *xen_platform_pdev;
|
|
|
|
#endif /* _XEN_PLATFORM_PCI_H */
|