[Xen-changelog] [linux-2.6.18-xen] xen: Fix the build.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205869053 0
# Node ID a461c109f74f8c0174eaaab870981cfdb3a44ac1
# Parent  2783eccd480552523bb16f3dee5967260862ed9b
xen: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 arch/i386/mach-xen/setup.c    |    1 +
 drivers/xen/pcifront/xenbus.c |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -r 2783eccd4805 -r a461c109f74f arch/i386/mach-xen/setup.c
--- a/arch/i386/mach-xen/setup.c        Tue Mar 18 15:01:09 2008 +0000
+++ b/arch/i386/mach-xen/setup.c        Tue Mar 18 19:37:33 2008 +0000
@@ -2,6 +2,7 @@
  *     Machine specific setup for generic
  */
 
+#include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
diff -r 2783eccd4805 -r a461c109f74f drivers/xen/pcifront/xenbus.c
--- a/drivers/xen/pcifront/xenbus.c     Tue Mar 18 15:01:09 2008 +0000
+++ b/drivers/xen/pcifront/xenbus.c     Tue Mar 18 19:37:33 2008 +0000
@@ -10,6 +10,10 @@
 #include <xen/gnttab.h>
 #include "pcifront.h"
 
+#ifndef __init_refok
+#define __init_refok
+#endif
+
 #define INVALID_GRANT_REF (0)
 #define INVALID_EVTCHN    (-1)
 
@@ -277,7 +281,7 @@ static int __devinit pcifront_attach_dev
 
 static int pcifront_detach_devices(struct pcifront_device *pdev)
 {
-       int err;
+       int err = 0;
        int i, num_devs;
        unsigned int domain, bus, slot, func;
        struct pci_bus *pci_bus;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog