From f75cb2994b7e7810efbc988a09f550491fd948fc30f26db625c514d4c997c1db Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 14 May 2012 05:45:42 +0000
Subject: [PATCH] - remove inclusion of asm/system.h from platform-pci.c

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=183
---
 pv-driver-build.patch                               | 10 ++++++++++
 xen.changes                                         |  5 +++++
 xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch |  6 +++---
 xen.spec                                            |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pv-driver-build.patch b/pv-driver-build.patch
index 90dff81..f4a9fe9 100644
--- a/pv-driver-build.patch
+++ b/pv-driver-build.patch
@@ -33,3 +33,13 @@
  
  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>
diff --git a/xen.changes b/xen.changes
index e45763d..e28867e 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch b/xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch
index 3a61b44..f3282c7 100644
--- a/xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch
+++ b/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;
  
diff --git a/xen.spec b/xen.spec
index 52ffc39..b6b1de2 100644
--- a/xen.spec
+++ b/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