direct-io.hg

changeset 8354:3c88c4d68fc1

Clarify the BSD-ish licenses for the blk and net front-end drivers so
that it is clear they are fully GPL-compatible and satisfy the free
software definitions in include/linux/module.h.

Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Stephen Tweedie <sct@redhat.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Dec 14 01:25:07 2005 +0100 (2005-12-14)
parents 89250c81cdd2
children d48b19263e46
files linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Tue Dec 13 22:12:02 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Dec 14 01:25:07 2005 +0100
     1.3 @@ -10,8 +10,11 @@
     1.4   * Copyright (c) 2005, Christopher Clark
     1.5   * Copyright (c) 2005, XenSource Ltd
     1.6   * 
     1.7 - * This file may be distributed separately from the Linux kernel, or
     1.8 - * incorporated into other software packages, subject to the following license:
     1.9 + * This program is free software; you can redistribute it and/or
    1.10 + * modify it under the terms of the GNU General Public License version 2
    1.11 + * as published by the Free Software Foundation; or, when distributed
    1.12 + * separately from the Linux kernel or incorporated into other
    1.13 + * software packages, subject to the following license:
    1.14   * 
    1.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
    1.16   * of this source file (the "Software"), to deal in the Software without
    1.17 @@ -820,7 +823,7 @@ static void xlblk_exit(void)
    1.18  }
    1.19  module_exit(xlblk_exit);
    1.20  
    1.21 -MODULE_LICENSE("BSD");
    1.22 +MODULE_LICENSE("Dual BSD/GPL");
    1.23  
    1.24  
    1.25  /*
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Tue Dec 13 22:12:02 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Dec 14 01:25:07 2005 +0100
     2.3 @@ -4,8 +4,11 @@
     2.4   * Copyright (c) 2002-2005, K A Fraser
     2.5   * Copyright (c) 2005, XenSource Ltd
     2.6   * 
     2.7 - * This file may be distributed separately from the Linux kernel, or
     2.8 - * incorporated into other software packages, subject to the following license:
     2.9 + * This program is free software; you can redistribute it and/or
    2.10 + * modify it under the terms of the GNU General Public License version 2
    2.11 + * as published by the Free Software Foundation; or, when distributed
    2.12 + * separately from the Linux kernel or incorporated into other
    2.13 + * software packages, subject to the following license:
    2.14   * 
    2.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
    2.16   * of this source file (the "Software"), to deal in the Software without
    2.17 @@ -1294,7 +1297,7 @@ static void netif_exit(void)
    2.18  }
    2.19  module_exit(netif_exit);
    2.20  
    2.21 -MODULE_LICENSE("BSD");
    2.22 +MODULE_LICENSE("Dual BSD/GPL");
    2.23   
    2.24   
    2.25  /* ** /proc **/