ia64/linux-2.6.18-xen.hg

changeset 486:a461c109f74f

xen: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 19:37:33 2008 +0000 (2008-03-18)
parents 2783eccd4805
children 9a5af85d3238
files arch/i386/mach-xen/setup.c drivers/xen/pcifront/xenbus.c
line diff
     1.1 --- a/arch/i386/mach-xen/setup.c	Tue Mar 18 15:01:09 2008 +0000
     1.2 +++ b/arch/i386/mach-xen/setup.c	Tue Mar 18 19:37:33 2008 +0000
     1.3 @@ -2,6 +2,7 @@
     1.4   *	Machine specific setup for generic
     1.5   */
     1.6  
     1.7 +#include <linux/mm.h>
     1.8  #include <linux/smp.h>
     1.9  #include <linux/init.h>
    1.10  #include <linux/interrupt.h>
     2.1 --- a/drivers/xen/pcifront/xenbus.c	Tue Mar 18 15:01:09 2008 +0000
     2.2 +++ b/drivers/xen/pcifront/xenbus.c	Tue Mar 18 19:37:33 2008 +0000
     2.3 @@ -10,6 +10,10 @@
     2.4  #include <xen/gnttab.h>
     2.5  #include "pcifront.h"
     2.6  
     2.7 +#ifndef __init_refok
     2.8 +#define __init_refok
     2.9 +#endif
    2.10 +
    2.11  #define INVALID_GRANT_REF (0)
    2.12  #define INVALID_EVTCHN    (-1)
    2.13  
    2.14 @@ -277,7 +281,7 @@ static int __devinit pcifront_attach_dev
    2.15  
    2.16  static int pcifront_detach_devices(struct pcifront_device *pdev)
    2.17  {
    2.18 -	int err;
    2.19 +	int err = 0;
    2.20  	int i, num_devs;
    2.21  	unsigned int domain, bus, slot, func;
    2.22  	struct pci_bus *pci_bus;