direct-io.hg

changeset 2355:e5d651fc9af5

bitkeeper revision 1.1159.53.3 (412e695eeFpJoA3teQTvadoyC5gOkQ)

Fix broken merge.
author iap10@labyrinth.cl.cam.ac.uk
date Thu Aug 26 22:51:10 2004 +0000 (2004-08-26)
parents 761c36876724
children cfe5c20ae78e
files .rootkeys linux-2.6.7-xen-sparse/arch/xen/kernel/gnttab.c linux-2.6.7-xen-sparse/include/asm-xen/gnttab.h linux-2.6.8.1-xen-sparse/arch/xen/kernel/gnttab.c linux-2.6.8.1-xen-sparse/include/asm-xen/gnttab.h
line diff
     1.1 --- a/.rootkeys	Thu Aug 26 22:21:02 2004 +0000
     1.2 +++ b/.rootkeys	Thu Aug 26 22:51:10 2004 +0000
     1.3 @@ -125,8 +125,6 @@ 3e5a4e681xMPdF9xCMwpyfuYMySU5g linux-2.4
     1.4  409ba2e7akOFqQUg6Qyg2s28xcXiMg linux-2.4.27-xen-sparse/mm/page_alloc.c
     1.5  3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.27-xen-sparse/mm/swapfile.c
     1.6  41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.27-xen-sparse/mm/vmalloc.c
     1.7 -412dfae9eA3_6e6bCGUtg1mj8b56fQ linux-2.6.7-xen-sparse/arch/xen/kernel/gnttab.c
     1.8 -412dfaeazclyNDM0cpnp60Yo4xulpQ linux-2.6.7-xen-sparse/include/asm-xen/gnttab.h
     1.9  40f562372u3A7_kfbYYixPHJJxYUxA linux-2.6.8.1-xen-sparse/arch/xen/Kconfig
    1.10  40f56237utH41NPukqHksuNf29IC9A linux-2.6.8.1-xen-sparse/arch/xen/Kconfig.drivers
    1.11  40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.8.1-xen-sparse/arch/xen/Makefile
    1.12 @@ -171,6 +169,7 @@ 40f56239bvOjuuuViZ0XMlNiREFC0A linux-2.6
    1.13  40f56239pYRq5yshPTkv3ujXKc8K6g linux-2.6.8.1-xen-sparse/arch/xen/kernel/empty.c
    1.14  40f56238xFQe9T7M_U_FItM-bZIpLw linux-2.6.8.1-xen-sparse/arch/xen/kernel/evtchn.c
    1.15  4110f478aeQWllIN7J4kouAHiAqrPw linux-2.6.8.1-xen-sparse/arch/xen/kernel/fixup.c
    1.16 +412dfae9eA3_6e6bCGUtg1mj8b56fQ linux-2.6.8.1-xen-sparse/arch/xen/kernel/gnttab.c
    1.17  40f56239sFcjHiIRmnObRIDF-zaeKQ linux-2.6.8.1-xen-sparse/arch/xen/kernel/process.c
    1.18  40f562392LBhwmOxVPsYdkYXMxI_ZQ linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c
    1.19  3f68905c5eiA-lBMQSvXLMWS1ikDEA linux-2.6.8.1-xen-sparse/arch/xen/kernel/xen_proc.c
    1.20 @@ -241,6 +240,7 @@ 41062ab7uFxnCq-KtPeAm-aV8CicgA linux-2.6
    1.21  40f5623bxUbeGjkRrjDguCy_Gm8RLw linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/xor.h
    1.22  40f5623bYNP7tHE2zX6YQxp9Zq2utQ linux-2.6.8.1-xen-sparse/include/asm-xen/ctrl_if.h
    1.23  40f5623b3Eqs8pAc5WpPX8_jTzV2qw linux-2.6.8.1-xen-sparse/include/asm-xen/evtchn.h
    1.24 +412dfaeazclyNDM0cpnp60Yo4xulpQ linux-2.6.8.1-xen-sparse/include/asm-xen/gnttab.h
    1.25  40f5623aGPlsm0u1LTO-NVZ6AGzNRQ linux-2.6.8.1-xen-sparse/include/asm-xen/hypervisor.h
    1.26  40f5623cndVUFlkxpf7Lfx7xu8madQ linux-2.6.8.1-xen-sparse/include/asm-xen/multicall.h
    1.27  3f108af1ylCIm82H052FVTfXACBHrw linux-2.6.8.1-xen-sparse/include/asm-xen/proc_cmd.h
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/gnttab.c	Thu Aug 26 22:21:02 2004 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,46 +0,0 @@
     2.4 -/******************************************************************************
     2.5 - * gnttab.c
     2.6 - * 
     2.7 - * Two sets of functionality:
     2.8 - * 1. Granting foreign access to our memory reservation.
     2.9 - * 2. Accessing others' memory reservations via grant references.
    2.10 - * (i.e., mechanisms for both sender and recipient of grant references)
    2.11 - * 
    2.12 - * Copyright (c) 2004, K A Fraser
    2.13 - */
    2.14 -
    2.15 -#include <linux/config.h>
    2.16 -#include <linux/module.h>
    2.17 -#include <asm-xen/gnttab.h>
    2.18 -
    2.19 -EXPORT_SYMBOL(gnttab_grant_foreign_access);
    2.20 -EXPORT_SYMBOL(gnttab_end_foreign_access);
    2.21 -EXPORT_SYMBOL(gnttab_grant_foreign_transfer);
    2.22 -EXPORT_SYMBOL(gnttab_end_foreign_transfer);
    2.23 -
    2.24 -grant_ref_t
    2.25 -gnttab_grant_foreign_access(
    2.26 -    domid_t domid, unsigned long frame, int readonly)
    2.27 -{
    2.28 -    return 0;
    2.29 -}
    2.30 -
    2.31 -void
    2.32 -gnttab_end_foreign_access(
    2.33 -    grant_ref_t ref, int readonly)
    2.34 -{
    2.35 -}
    2.36 -
    2.37 -grant_ref_t
    2.38 -gnttab_grant_foreign_transfer(
    2.39 -    domid_t domid)
    2.40 -{
    2.41 -    return 0;
    2.42 -}
    2.43 -
    2.44 -unsigned long
    2.45 -gnttab_end_foreign_transfer(
    2.46 -    grant_ref_t ref)
    2.47 -{
    2.48 -    return 0;
    2.49 -}
     3.1 --- a/linux-2.6.7-xen-sparse/include/asm-xen/gnttab.h	Thu Aug 26 22:21:02 2004 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,35 +0,0 @@
     3.4 -/******************************************************************************
     3.5 - * gnttab.h
     3.6 - * 
     3.7 - * Two sets of functionality:
     3.8 - * 1. Granting foreign access to our memory reservation.
     3.9 - * 2. Accessing others' memory reservations via grant references.
    3.10 - * (i.e., mechanisms for both sender and recipient of grant references)
    3.11 - * 
    3.12 - * Copyright (c) 2004, K A Fraser
    3.13 - */
    3.14 -
    3.15 -#ifndef __ASM_GNTTAB_H__
    3.16 -#define __ASM_GNTTAB_H__
    3.17 -
    3.18 -#include <linux/config.h>
    3.19 -#include <asm-xen/hypervisor.h>
    3.20 -#include <asm-xen/hypervisor-ifs/grant_table.h>
    3.21 -
    3.22 -grant_ref_t
    3.23 -gnttab_grant_foreign_access(
    3.24 -    domid_t domid, unsigned long frame, int readonly);
    3.25 -
    3.26 -void
    3.27 -gnttab_end_foreign_access(
    3.28 -    grant_ref_t ref, int readonly);
    3.29 -
    3.30 -grant_ref_t
    3.31 -gnttab_grant_foreign_transfer(
    3.32 -    domid_t domid);
    3.33 -
    3.34 -unsigned long
    3.35 -gnttab_end_foreign_transfer(
    3.36 -    grant_ref_t ref);
    3.37 -
    3.38 -#endif /* __ASM_GNTTAB_H__ */
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/gnttab.c	Thu Aug 26 22:51:10 2004 +0000
     4.3 @@ -0,0 +1,46 @@
     4.4 +/******************************************************************************
     4.5 + * gnttab.c
     4.6 + * 
     4.7 + * Two sets of functionality:
     4.8 + * 1. Granting foreign access to our memory reservation.
     4.9 + * 2. Accessing others' memory reservations via grant references.
    4.10 + * (i.e., mechanisms for both sender and recipient of grant references)
    4.11 + * 
    4.12 + * Copyright (c) 2004, K A Fraser
    4.13 + */
    4.14 +
    4.15 +#include <linux/config.h>
    4.16 +#include <linux/module.h>
    4.17 +#include <asm-xen/gnttab.h>
    4.18 +
    4.19 +EXPORT_SYMBOL(gnttab_grant_foreign_access);
    4.20 +EXPORT_SYMBOL(gnttab_end_foreign_access);
    4.21 +EXPORT_SYMBOL(gnttab_grant_foreign_transfer);
    4.22 +EXPORT_SYMBOL(gnttab_end_foreign_transfer);
    4.23 +
    4.24 +grant_ref_t
    4.25 +gnttab_grant_foreign_access(
    4.26 +    domid_t domid, unsigned long frame, int readonly)
    4.27 +{
    4.28 +    return 0;
    4.29 +}
    4.30 +
    4.31 +void
    4.32 +gnttab_end_foreign_access(
    4.33 +    grant_ref_t ref, int readonly)
    4.34 +{
    4.35 +}
    4.36 +
    4.37 +grant_ref_t
    4.38 +gnttab_grant_foreign_transfer(
    4.39 +    domid_t domid)
    4.40 +{
    4.41 +    return 0;
    4.42 +}
    4.43 +
    4.44 +unsigned long
    4.45 +gnttab_end_foreign_transfer(
    4.46 +    grant_ref_t ref)
    4.47 +{
    4.48 +    return 0;
    4.49 +}
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/gnttab.h	Thu Aug 26 22:51:10 2004 +0000
     5.3 @@ -0,0 +1,35 @@
     5.4 +/******************************************************************************
     5.5 + * gnttab.h
     5.6 + * 
     5.7 + * Two sets of functionality:
     5.8 + * 1. Granting foreign access to our memory reservation.
     5.9 + * 2. Accessing others' memory reservations via grant references.
    5.10 + * (i.e., mechanisms for both sender and recipient of grant references)
    5.11 + * 
    5.12 + * Copyright (c) 2004, K A Fraser
    5.13 + */
    5.14 +
    5.15 +#ifndef __ASM_GNTTAB_H__
    5.16 +#define __ASM_GNTTAB_H__
    5.17 +
    5.18 +#include <linux/config.h>
    5.19 +#include <asm-xen/hypervisor.h>
    5.20 +#include <asm-xen/hypervisor-ifs/grant_table.h>
    5.21 +
    5.22 +grant_ref_t
    5.23 +gnttab_grant_foreign_access(
    5.24 +    domid_t domid, unsigned long frame, int readonly);
    5.25 +
    5.26 +void
    5.27 +gnttab_end_foreign_access(
    5.28 +    grant_ref_t ref, int readonly);
    5.29 +
    5.30 +grant_ref_t
    5.31 +gnttab_grant_foreign_transfer(
    5.32 +    domid_t domid);
    5.33 +
    5.34 +unsigned long
    5.35 +gnttab_end_foreign_transfer(
    5.36 +    grant_ref_t ref);
    5.37 +
    5.38 +#endif /* __ASM_GNTTAB_H__ */