SHA256
1
0
forked from pool/xen

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

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=183
This commit is contained in:
Olaf Hering 2012-05-14 05:45:42 +00:00 committed by Git OBS Bridge
parent 5200007510
commit f75cb2994b
4 changed files with 19 additions and 3 deletions

View File

@ -33,3 +33,13 @@
static int init_hypercall_stubs(void) 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>

View File

@ -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 Tue Apr 3 08:33:36 MDT 2012 - carnold@novell.com

View File

@ -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/vmalloc.h>
#include <linux/mm.h> #include <linux/mm.h>
+#include <linux/crash_dump.h> +#include <linux/crash_dump.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.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; 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, static int __devinit platform_pci_init(struct pci_dev *pdev,
const struct pci_device_id *ent) 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())) if ((ret = xen_panic_handler_init()))
goto out; goto out;

View File

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