ia64/xen-unstable

changeset 3742:d1e1c9854420

bitkeeper revision 1.1159.255.3 (420918d3OV9YNdw3dCaE6e4udrKnDA)

manual merge
author iap10@freefall.cl.cam.ac.uk
date Tue Feb 08 19:53:55 2005 +0000 (2005-02-08)
parents 872ae5bed5f4 6062bb54a227
children e2b4ca470b91
files linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c xen/arch/x86/domain.c xen/arch/x86/mm.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Tue Feb 08 19:26:54 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Tue Feb 08 19:53:55 2005 +0000
     1.3 @@ -1,11 +1,11 @@
     1.4  /******************************************************************************
     1.5 - * arch/xen/drivers/netif/backend/main.c
     1.6 + * drivers/xen/netback/netback.c
     1.7   * 
     1.8 - * Back-end of the driver for virtual block devices. This portion of the
     1.9 - * driver exports a 'unified' block-device interface that can be accessed
    1.10 + * Back-end of the driver for virtual network devices. This portion of the
    1.11 + * driver exports a 'unified' network-device interface that can be accessed
    1.12   * by any operating system that implements a compatible front end. A 
    1.13   * reference front-end implementation can be found in:
    1.14 - *  arch/xen/drivers/netif/frontend
    1.15 + *  drivers/xen/netfront/netfront.c
    1.16   * 
    1.17   * Copyright (c) 2002-2004, K A Fraser
    1.18   */