xen: Fix the build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/arch/i386/mach-xen/setup.c b/arch/i386/mach-xen/setup.c
index 749ea0b2df466b4c1dbd0e84dd6de7f0057d25f3..8a36ea81519daf1f9ba94393c5e3aa916418b3a8 100644 (file)
--- a/arch/i386/mach-xen/setup.c
+++ b/arch/i386/mach-xen/setup.c
@@ -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 --git a/drivers/xen/pcifront/xenbus.c b/drivers/xen/pcifront/xenbus.c
index 75480a1d79499b0152bca06e1c9f56fdb83faef1..a9f5ab5eb7c2cfb31262944163295b2421938c6a 100644 (file)
--- a/drivers/xen/pcifront/xenbus.c
+++ b/drivers/xen/pcifront/xenbus.c
@@ -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_devices(struct pcifront_device *pdev)
 
 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;