ia64/xen-unstable

changeset 6046:e0146a206ea2

- include linux/vmalloc.h for vmalloc
- include grant table includes from common.h rather than blkback.c,
since both C files use grant tables
- include linux/version.h from block.h (a macro there uses it)
- include asm-xen/hypervisor.h from block.h (virt_to_machine)

Signed-off-by: Matthew Chapman <matthewc@hp.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat Aug 06 09:52:01 2005 +0000 (2005-08-06)
parents 5f6787c5c71f
children 7931f14bd447
files linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/common.h linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sat Aug 06 09:50:51 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sat Aug 06 09:52:01 2005 +0000
     1.3 @@ -12,9 +12,6 @@
     1.4   */
     1.5  
     1.6  #include "common.h"
     1.7 -#ifdef CONFIG_XEN_BLKDEV_GRANT
     1.8 -#include <asm-xen/xen-public/grant_table.h>
     1.9 -#endif
    1.10  
    1.11  /*
    1.12   * These are rather arbitrary. They are fairly large because adjacent requests
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Sat Aug 06 09:50:51 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Sat Aug 06 09:52:01 2005 +0000
     2.3 @@ -9,6 +9,7 @@
     2.4  #include <linux/interrupt.h>
     2.5  #include <linux/slab.h>
     2.6  #include <linux/blkdev.h>
     2.7 +#include <linux/vmalloc.h>
     2.8  #include <asm/io.h>
     2.9  #include <asm/setup.h>
    2.10  #include <asm/pgalloc.h>
    2.11 @@ -17,6 +18,9 @@
    2.12  #include <asm-xen/hypervisor.h>
    2.13  #include <asm-xen/xen-public/io/blkif.h>
    2.14  #include <asm-xen/xen-public/io/ring.h>
    2.15 +#ifdef CONFIG_XEN_BLKDEV_GRANT
    2.16 +#include <asm-xen/gnttab.h>
    2.17 +#endif
    2.18  
    2.19  #if 0
    2.20  #define ASSERT(_p) \
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Sat Aug 06 09:50:51 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Sat Aug 06 09:52:01 2005 +0000
     3.3 @@ -33,6 +33,7 @@
     3.4  #define __XEN_DRIVERS_BLOCK_H__
     3.5  
     3.6  #include <linux/config.h>
     3.7 +#include <linux/version.h>
     3.8  #include <linux/module.h>
     3.9  #include <linux/kernel.h>
    3.10  #include <linux/sched.h>
    3.11 @@ -44,6 +45,7 @@
    3.12  #include <linux/blkdev.h>
    3.13  #include <linux/major.h>
    3.14  #include <linux/devfs_fs_kernel.h>
    3.15 +#include <asm-xen/hypervisor.h>
    3.16  #include <asm-xen/xen-public/xen.h>
    3.17  #include <asm-xen/xen-public/io/blkif.h>
    3.18  #include <asm-xen/xen-public/io/ring.h>