Accepting request 120866 from Virtualization

- add dummy asm/smp-processor-id.h for kernel-source 3.4-rcX

- remove inclusion of asm/system.h from platform-pci.c

OBS-URL: https://build.opensuse.org/request/show/120866
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=157

pv-driver-build.patch

@@ -33,3 +33,23 @@
  
  static int init_hypercall_stubs(void)
  {
+--- 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
+@@ -30,7 +30,6 @@
+ #include <linux/interrupt.h>
+ #include <linux/vmalloc.h>
+ #include <linux/mm.h>
+-#include <asm/system.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ #include <asm/uaccess.h>
+--- xen-4.1.2-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
++++ xen-4.1.2-testing/unmodified_drivers/linux-2.6/mkbuildtree
+@@ -52,6 +52,7 @@ ln -nsf ${XEN}/include/public include/xe
+ case "$uname" in
+ i[34567]86|x86_64)
+     if [ -d ${XL}/arch/x86/include/mach-xen ]; then
++        ln -sfv ${XL}/arch/x86/include/mach-xen/asm/smp-processor-id.h include/asm
+         ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypervisor.h include/asm
+         ln -sf ${XL}/arch/x86/include/mach-xen/asm/hypercall*.h include/asm
+         ln -sf ${XL}/arch/x86/include/mach-xen/asm/synch_bitops*.h include/asm

xen.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon May 14 08:32:45 CEST 2012 - ohering@suse.de
+
+- add dummy asm/smp-processor-id.h for kernel-source 3.4-rcX
+
+-------------------------------------------------------------------
+Mon May 14 07:43:33 CEST 2012 - ohering@suse.de
+
+- remove inclusion of asm/system.h from platform-pci.c
+
 -------------------------------------------------------------------
 Tue Apr  3 08:33:36 MDT 2012 - carnold@novell.com
 

xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch

@@ -16,10 +16,10 @@ Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.
  #include <linux/vmalloc.h>
  #include <linux/mm.h>
 +#include <linux/crash_dump.h>
- #include <asm/system.h>
  #include <asm/io.h>
  #include <asm/irq.h>
-@@ -359,6 +360,32 @@ static int check_platform_magic(struct d
+ #include <asm/uaccess.h>
+@@ -358,6 +359,32 @@ static int check_platform_magic(struct d
  	return -ENODEV;
  }
  
@@ -52,7 +52,7 @@ Index: xen-4.1.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.
  static int __devinit platform_pci_init(struct pci_dev *pdev,
  				       const struct pci_device_id *ent)
  {
-@@ -427,6 +454,10 @@ static int __devinit platform_pci_init(s
+@@ -426,6 +453,10 @@ static int __devinit platform_pci_init(s
  	if ((ret = xen_panic_handler_init()))
  		goto out;
  

xen.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.1