1.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Wed Mar 22 10:38:44 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Wed Mar 22 11:30:57 2006 +0100
     1.3 @@ -5,8 +5,11 @@
     1.4   * 
     1.5   * Copyright (c) 2002-2004, K A Fraser
     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

     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Wed Mar 22 10:38:44 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c	Wed Mar 22 11:30:57 2006 +0100
     2.3 @@ -7,8 +7,11 @@
     2.4   * Copyright (c) 2003-2004, M Williamson, K Fraser
     2.5   * Copyright (c) 2005 Dan M. Smith, IBM Corporation
     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 @@ -572,9 +575,11 @@ void balloon_dealloc_empty_page_range(
    2.18  	schedule_work(&balloon_worker);
    2.19  }
    2.20  
    2.21 -EXPORT_SYMBOL(balloon_update_driver_allowance);
    2.22 -EXPORT_SYMBOL(balloon_alloc_empty_page_range);
    2.23 -EXPORT_SYMBOL(balloon_dealloc_empty_page_range);
    2.24 +EXPORT_SYMBOL_GPL(balloon_update_driver_allowance);
    2.25 +EXPORT_SYMBOL_GPL(balloon_alloc_empty_page_range);
    2.26 +EXPORT_SYMBOL_GPL(balloon_dealloc_empty_page_range);
    2.27 +
    2.28 +MODULE_LICENSE("Dual BSD/GPL");
    2.29  
    2.30  /*
    2.31   * Local variables:

     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Mar 22 10:38:44 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Mar 22 11:30:57 2006 +0100
     3.3 @@ -9,6 +9,30 @@
     3.4   * 
     3.5   * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
     3.6   * Copyright (c) 2005, Christopher Clark
     3.7 + * 
     3.8 + * This program is free software; you can redistribute it and/or
     3.9 + * modify it under the terms of the GNU General Public License version 2
    3.10 + * as published by the Free Software Foundation; or, when distributed
    3.11 + * separately from the Linux kernel or incorporated into other
    3.12 + * software packages, subject to the following license:
    3.13 + * 
    3.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    3.15 + * of this source file (the "Software"), to deal in the Software without
    3.16 + * restriction, including without limitation the rights to use, copy, modify,
    3.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    3.18 + * and to permit persons to whom the Software is furnished to do so, subject to
    3.19 + * the following conditions:
    3.20 + * 
    3.21 + * The above copyright notice and this permission notice shall be included in
    3.22 + * all copies or substantial portions of the Software.
    3.23 + * 
    3.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    3.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    3.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    3.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    3.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    3.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    3.30 + * IN THE SOFTWARE.
    3.31   */
    3.32  
    3.33  #include <linux/spinlock.h>

     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Wed Mar 22 10:38:44 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Wed Mar 22 11:30:57 2006 +0100
     4.3 @@ -1,3 +1,28 @@
     4.4 +/* 
     4.5 + * This program is free software; you can redistribute it and/or
     4.6 + * modify it under the terms of the GNU General Public License version 2
     4.7 + * as published by the Free Software Foundation; or, when distributed
     4.8 + * separately from the Linux kernel or incorporated into other
     4.9 + * software packages, subject to the following license:
    4.10 + * 
    4.11 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    4.12 + * of this source file (the "Software"), to deal in the Software without
    4.13 + * restriction, including without limitation the rights to use, copy, modify,
    4.14 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    4.15 + * and to permit persons to whom the Software is furnished to do so, subject to
    4.16 + * the following conditions:
    4.17 + * 
    4.18 + * The above copyright notice and this permission notice shall be included in
    4.19 + * all copies or substantial portions of the Software.
    4.20 + * 
    4.21 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    4.22 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    4.23 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    4.24 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    4.25 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    4.26 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    4.27 + * IN THE SOFTWARE.
    4.28 + */
    4.29  
    4.30  #ifndef __BLKIF__BACKEND__COMMON_H__
    4.31  #define __BLKIF__BACKEND__COMMON_H__

     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Wed Mar 22 10:38:44 2006 +0100
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Wed Mar 22 11:30:57 2006 +0100
     5.3 @@ -4,6 +4,30 @@
     5.4   * Block-device interface management.
     5.5   * 
     5.6   * Copyright (c) 2004, Keir Fraser
     5.7 + * 
     5.8 + * This program is free software; you can redistribute it and/or
     5.9 + * modify it under the terms of the GNU General Public License version 2
    5.10 + * as published by the Free Software Foundation; or, when distributed
    5.11 + * separately from the Linux kernel or incorporated into other
    5.12 + * software packages, subject to the following license:
    5.13 + * 
    5.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    5.15 + * of this source file (the "Software"), to deal in the Software without
    5.16 + * restriction, including without limitation the rights to use, copy, modify,
    5.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    5.18 + * and to permit persons to whom the Software is furnished to do so, subject to
    5.19 + * the following conditions:
    5.20 + * 
    5.21 + * The above copyright notice and this permission notice shall be included in
    5.22 + * all copies or substantial portions of the Software.
    5.23 + * 
    5.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    5.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    5.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    5.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    5.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    5.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    5.30 + * IN THE SOFTWARE.
    5.31   */
    5.32  
    5.33  #include "common.h"

     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/vbd.c	Wed Mar 22 10:38:44 2006 +0100
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/vbd.c	Wed Mar 22 11:30:57 2006 +0100
     6.3 @@ -4,6 +4,30 @@
     6.4   * Routines for managing virtual block devices (VBDs).
     6.5   * 
     6.6   * Copyright (c) 2003-2005, Keir Fraser & Steve Hand
     6.7 + * 
     6.8 + * This program is free software; you can redistribute it and/or
     6.9 + * modify it under the terms of the GNU General Public License version 2
    6.10 + * as published by the Free Software Foundation; or, when distributed
    6.11 + * separately from the Linux kernel or incorporated into other
    6.12 + * software packages, subject to the following license:
    6.13 + * 
    6.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    6.15 + * of this source file (the "Software"), to deal in the Software without
    6.16 + * restriction, including without limitation the rights to use, copy, modify,
    6.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    6.18 + * and to permit persons to whom the Software is furnished to do so, subject to
    6.19 + * the following conditions:
    6.20 + * 
    6.21 + * The above copyright notice and this permission notice shall be included in
    6.22 + * all copies or substantial portions of the Software.
    6.23 + * 
    6.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    6.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    6.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    6.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    6.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    6.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    6.30 + * IN THE SOFTWARE.
    6.31   */
    6.32  
    6.33  #include "common.h"

     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Mar 22 10:38:44 2006 +0100
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Mar 22 11:30:57 2006 +0100
     7.3 @@ -810,7 +810,6 @@ module_exit(xlblk_exit);
     7.4  
     7.5  MODULE_LICENSE("Dual BSD/GPL");
     7.6  
     7.7 -
     7.8  /*
     7.9   * Local variables:
    7.10   *  c-file-style: "linux"

     8.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Mar 22 10:38:44 2006 +0100
     8.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Mar 22 11:30:57 2006 +0100
     8.3 @@ -7,8 +7,11 @@
     8.4   * Modifications by Mark A. Williamson are (c) Intel Research Cambridge
     8.5   * Copyright (c) 2004-2005, Christian Limpach
     8.6   * 
     8.7 - * This file may be distributed separately from the Linux kernel, or
     8.8 - * incorporated into other software packages, subject to the following license:
     8.9 + * This program is free software; you can redistribute it and/or
    8.10 + * modify it under the terms of the GNU General Public License version 2
    8.11 + * as published by the Free Software Foundation; or, when distributed
    8.12 + * separately from the Linux kernel or incorporated into other
    8.13 + * software packages, subject to the following license:
    8.14   * 
    8.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
    8.16   * of this source file (the "Software"), to deal in the Software without

     9.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Wed Mar 22 10:38:44 2006 +0100
     9.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c	Wed Mar 22 11:30:57 2006 +0100
     9.3 @@ -7,8 +7,11 @@
     9.4   * Modifications by Mark A. Williamson are (c) Intel Research Cambridge
     9.5   * Copyright (c) 2004-2005, Christian Limpach
     9.6   * 
     9.7 - * This file may be distributed separately from the Linux kernel, or
     9.8 - * incorporated into other software packages, subject to the following license:
     9.9 + * This program is free software; you can redistribute it and/or
    9.10 + * modify it under the terms of the GNU General Public License version 2
    9.11 + * as published by the Free Software Foundation; or, when distributed
    9.12 + * separately from the Linux kernel or incorporated into other
    9.13 + * software packages, subject to the following license:
    9.14   * 
    9.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
    9.16   * of this source file (the "Software"), to deal in the Software without

    10.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Mar 22 10:38:44 2006 +0100
    10.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Mar 22 11:30:57 2006 +0100
    10.3 @@ -5,8 +5,11 @@
    10.4   * 
    10.5   * Copyright (c) 2002-2004, K A Fraser.
    10.6   * 
    10.7 - * This file may be distributed separately from the Linux kernel, or
    10.8 - * incorporated into other software packages, subject to the following license:
    10.9 + * This program is free software; you can redistribute it and/or
   10.10 + * modify it under the terms of the GNU General Public License version 2
   10.11 + * as published by the Free Software Foundation; or, when distributed
   10.12 + * separately from the Linux kernel or incorporated into other
   10.13 + * software packages, subject to the following license:
   10.14   * 
   10.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   10.16   * of this source file (the "Software"), to deal in the Software without
   10.17 @@ -632,6 +635,8 @@ static int __init xencons_init(void)
   10.18  
   10.19  module_init(xencons_init);
   10.20  
   10.21 +MODULE_LICENSE("Dual BSD/GPL");
   10.22 +
   10.23  /*
   10.24   * Local variables:
   10.25   *  c-file-style: "linux"

    11.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Wed Mar 22 10:38:44 2006 +0100
    11.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c	Wed Mar 22 11:30:57 2006 +0100
    11.3 @@ -1,3 +1,29 @@
    11.4 +/* 
    11.5 + * This program is free software; you can redistribute it and/or
    11.6 + * modify it under the terms of the GNU General Public License version 2
    11.7 + * as published by the Free Software Foundation; or, when distributed
    11.8 + * separately from the Linux kernel or incorporated into other
    11.9 + * software packages, subject to the following license:
   11.10 + * 
   11.11 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   11.12 + * of this source file (the "Software"), to deal in the Software without
   11.13 + * restriction, including without limitation the rights to use, copy, modify,
   11.14 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   11.15 + * and to permit persons to whom the Software is furnished to do so, subject to
   11.16 + * the following conditions:
   11.17 + * 
   11.18 + * The above copyright notice and this permission notice shall be included in
   11.19 + * all copies or substantial portions of the Software.
   11.20 + * 
   11.21 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   11.22 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   11.23 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   11.24 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   11.25 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   11.26 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   11.27 + * IN THE SOFTWARE.
   11.28 + */
   11.29 +
   11.30  #include <linux/version.h>
   11.31  #include <linux/module.h>
   11.32  #include <linux/errno.h>

    12.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Wed Mar 22 10:38:44 2006 +0100
    12.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c	Wed Mar 22 11:30:57 2006 +0100
    12.3 @@ -5,8 +5,11 @@
    12.4   * 
    12.5   * Copyright (c) 2002-2005, K A Fraser
    12.6   * 
    12.7 - * This file may be distributed separately from the Linux kernel, or
    12.8 - * incorporated into other software packages, subject to the following license:
    12.9 + * This program is free software; you can redistribute it and/or
   12.10 + * modify it under the terms of the GNU General Public License version 2
   12.11 + * as published by the Free Software Foundation; or, when distributed
   12.12 + * separately from the Linux kernel or incorporated into other
   12.13 + * software packages, subject to the following license:
   12.14   * 
   12.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   12.16   * of this source file (the "Software"), to deal in the Software without
   12.17 @@ -147,7 +150,7 @@ void force_evtchn_callback(void)
   12.18  {
   12.19  	(void)HYPERVISOR_xen_version(0, NULL);
   12.20  }
   12.21 -EXPORT_SYMBOL(force_evtchn_callback);
   12.22 +EXPORT_SYMBOL_GPL(force_evtchn_callback);
   12.23  
   12.24  /* NB. Interrupts are disabled on entry. */
   12.25  asmlinkage void evtchn_do_upcall(struct pt_regs *regs)
   12.26 @@ -323,7 +326,7 @@ int bind_evtchn_to_irqhandler(
   12.27  
   12.28  	return irq;
   12.29  }
   12.30 -EXPORT_SYMBOL(bind_evtchn_to_irqhandler);
   12.31 +EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);
   12.32  
   12.33  int bind_virq_to_irqhandler(
   12.34  	unsigned int virq,
   12.35 @@ -345,7 +348,7 @@ int bind_virq_to_irqhandler(
   12.36  
   12.37  	return irq;
   12.38  }
   12.39 -EXPORT_SYMBOL(bind_virq_to_irqhandler);
   12.40 +EXPORT_SYMBOL_GPL(bind_virq_to_irqhandler);
   12.41  
   12.42  int bind_ipi_to_irqhandler(
   12.43  	unsigned int ipi,
   12.44 @@ -367,14 +370,14 @@ int bind_ipi_to_irqhandler(
   12.45  
   12.46  	return irq;
   12.47  }
   12.48 -EXPORT_SYMBOL(bind_ipi_to_irqhandler);
   12.49 +EXPORT_SYMBOL_GPL(bind_ipi_to_irqhandler);
   12.50  
   12.51  void unbind_from_irqhandler(unsigned int irq, void *dev_id)
   12.52  {
   12.53  	free_irq(irq, dev_id);
   12.54  	unbind_from_irq(irq);
   12.55  }
   12.56 -EXPORT_SYMBOL(unbind_from_irqhandler);
   12.57 +EXPORT_SYMBOL_GPL(unbind_from_irqhandler);
   12.58  
   12.59  #ifdef CONFIG_SMP
   12.60  static void do_nothing_function(void *ign)
   12.61 @@ -639,14 +642,14 @@ void notify_remote_via_irq(int irq)
   12.62  	if (VALID_EVTCHN(evtchn))
   12.63  		notify_remote_via_evtchn(evtchn);
   12.64  }
   12.65 -EXPORT_SYMBOL(notify_remote_via_irq);
   12.66 +EXPORT_SYMBOL_GPL(notify_remote_via_irq);
   12.67  
   12.68  void mask_evtchn(int port)
   12.69  {
   12.70  	shared_info_t *s = HYPERVISOR_shared_info;
   12.71  	synch_set_bit(port, &s->evtchn_mask[0]);
   12.72  }
   12.73 -EXPORT_SYMBOL(mask_evtchn);
   12.74 +EXPORT_SYMBOL_GPL(mask_evtchn);
   12.75  
   12.76  void unmask_evtchn(int port)
   12.77  {
   12.78 @@ -677,7 +680,7 @@ void unmask_evtchn(int port)
   12.79  			force_evtchn_callback();
   12.80  	}
   12.81  }
   12.82 -EXPORT_SYMBOL(unmask_evtchn);
   12.83 +EXPORT_SYMBOL_GPL(unmask_evtchn);
   12.84  
   12.85  void irq_resume(void)
   12.86  {

    13.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/features.c	Wed Mar 22 10:38:44 2006 +0100
    13.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/features.c	Wed Mar 22 11:30:57 2006 +0100
    13.3 @@ -12,7 +12,7 @@
    13.4  #include <xen/features.h>
    13.5  
    13.6  u8 xen_features[XENFEAT_NR_SUBMAPS * 32] __read_mostly;
    13.7 -EXPORT_SYMBOL(xen_features);
    13.8 +EXPORT_SYMBOL_GPL(xen_features);
    13.9  
   13.10  void setup_xen_features(void)
   13.11  {

    14.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Wed Mar 22 10:38:44 2006 +0100
    14.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Wed Mar 22 11:30:57 2006 +0100
    14.3 @@ -6,8 +6,11 @@
    14.4   * Copyright (c) 2005, Christopher Clark
    14.5   * Copyright (c) 2004-2005, K A Fraser
    14.6   * 
    14.7 - * This file may be distributed separately from the Linux kernel, or
    14.8 - * incorporated into other software packages, subject to the following license:
    14.9 + * This program is free software; you can redistribute it and/or
   14.10 + * modify it under the terms of the GNU General Public License version 2
   14.11 + * as published by the Free Software Foundation; or, when distributed
   14.12 + * separately from the Linux kernel or incorporated into other
   14.13 + * software packages, subject to the following license:
   14.14   * 
   14.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   14.16   * of this source file (the "Software"), to deal in the Software without
   14.17 @@ -52,21 +55,21 @@
   14.18  	printk(KERN_WARNING "xen_grant: " fmt, ##args)
   14.19  
   14.20  
   14.21 -EXPORT_SYMBOL(gnttab_grant_foreign_access);
   14.22 -EXPORT_SYMBOL(gnttab_end_foreign_access_ref);
   14.23 -EXPORT_SYMBOL(gnttab_end_foreign_access);
   14.24 -EXPORT_SYMBOL(gnttab_query_foreign_access);
   14.25 -EXPORT_SYMBOL(gnttab_grant_foreign_transfer);
   14.26 -EXPORT_SYMBOL(gnttab_end_foreign_transfer_ref);
   14.27 -EXPORT_SYMBOL(gnttab_end_foreign_transfer);
   14.28 -EXPORT_SYMBOL(gnttab_alloc_grant_references);
   14.29 -EXPORT_SYMBOL(gnttab_free_grant_references);
   14.30 -EXPORT_SYMBOL(gnttab_free_grant_reference);
   14.31 -EXPORT_SYMBOL(gnttab_claim_grant_reference);
   14.32 -EXPORT_SYMBOL(gnttab_release_grant_reference);
   14.33 -EXPORT_SYMBOL(gnttab_request_free_callback);
   14.34 -EXPORT_SYMBOL(gnttab_grant_foreign_access_ref);
   14.35 -EXPORT_SYMBOL(gnttab_grant_foreign_transfer_ref);
   14.36 +EXPORT_SYMBOL_GPL(gnttab_grant_foreign_access);
   14.37 +EXPORT_SYMBOL_GPL(gnttab_end_foreign_access_ref);
   14.38 +EXPORT_SYMBOL_GPL(gnttab_end_foreign_access);
   14.39 +EXPORT_SYMBOL_GPL(gnttab_query_foreign_access);
   14.40 +EXPORT_SYMBOL_GPL(gnttab_grant_foreign_transfer);
   14.41 +EXPORT_SYMBOL_GPL(gnttab_end_foreign_transfer_ref);
   14.42 +EXPORT_SYMBOL_GPL(gnttab_end_foreign_transfer);
   14.43 +EXPORT_SYMBOL_GPL(gnttab_alloc_grant_references);
   14.44 +EXPORT_SYMBOL_GPL(gnttab_free_grant_references);
   14.45 +EXPORT_SYMBOL_GPL(gnttab_free_grant_reference);
   14.46 +EXPORT_SYMBOL_GPL(gnttab_claim_grant_reference);
   14.47 +EXPORT_SYMBOL_GPL(gnttab_release_grant_reference);
   14.48 +EXPORT_SYMBOL_GPL(gnttab_request_free_callback);
   14.49 +EXPORT_SYMBOL_GPL(gnttab_grant_foreign_access_ref);
   14.50 +EXPORT_SYMBOL_GPL(gnttab_grant_foreign_transfer_ref);
   14.51  
   14.52  /* External tools reserve first few grant table entries. */
   14.53  #define NR_RESERVED_ENTRIES 8

    15.1 --- a/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c	Wed Mar 22 10:38:44 2006 +0100
    15.2 +++ b/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c	Wed Mar 22 11:30:57 2006 +0100
    15.3 @@ -6,8 +6,11 @@
    15.4   * Copyright (c) 2004-2005, K A Fraser
    15.5   * Multi-process extensions Copyright (c) 2004, Steven Smith
    15.6   * 
    15.7 - * This file may be distributed separately from the Linux kernel, or
    15.8 - * incorporated into other software packages, subject to the following license:
    15.9 + * This program is free software; you can redistribute it and/or
   15.10 + * modify it under the terms of the GNU General Public License version 2
   15.11 + * as published by the Free Software Foundation; or, when distributed
   15.12 + * separately from the Linux kernel or incorporated into other
   15.13 + * software packages, subject to the following license:
   15.14   * 
   15.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   15.16   * of this source file (the "Software"), to deal in the Software without
   15.17 @@ -448,6 +451,8 @@ static void evtchn_cleanup(void)
   15.18  module_init(evtchn_init);
   15.19  module_exit(evtchn_cleanup);
   15.20  
   15.21 +MODULE_LICENSE("Dual BSD/GPL");
   15.22 +
   15.23  /*
   15.24   * Local variables:
   15.25   *  c-file-style: "linux"

    16.1 --- a/linux-2.6-xen-sparse/drivers/xen/net_driver_util.c	Wed Mar 22 10:38:44 2006 +0100
    16.2 +++ b/linux-2.6-xen-sparse/drivers/xen/net_driver_util.c	Wed Mar 22 11:30:57 2006 +0100
    16.3 @@ -4,9 +4,11 @@
    16.4   *
    16.5   * Copyright (c) 2005 XenSource Ltd.
    16.6   * 
    16.7 - * This file may be distributed separately from the Linux kernel, or
    16.8 - * incorporated into other software packages, subject to the following
    16.9 - * license:
   16.10 + * This program is free software; you can redistribute it and/or
   16.11 + * modify it under the terms of the GNU General Public License version 2
   16.12 + * as published by the Free Software Foundation; or, when distributed
   16.13 + * separately from the Linux kernel or incorporated into other
   16.14 + * software packages, subject to the following license:
   16.15   * 
   16.16   * Permission is hereby granted, free of charge, to any person obtaining a
   16.17   * copy of this source file (the "Software"), to deal in the Software without
   16.18 @@ -27,7 +29,6 @@
   16.19   * DEALINGS IN THE SOFTWARE.
   16.20   */
   16.21  
   16.22 -
   16.23  #include <linux/if_ether.h>
   16.24  #include <linux/err.h>
   16.25  #include <linux/module.h>
   16.26 @@ -54,7 +55,7 @@ int xen_net_read_mac(struct xenbus_devic
   16.27  	kfree(macstr);
   16.28  	return 0;
   16.29  }
   16.30 -EXPORT_SYMBOL(xen_net_read_mac);
   16.31 +EXPORT_SYMBOL_GPL(xen_net_read_mac);
   16.32  
   16.33  /*
   16.34   * Local variables:

    17.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Wed Mar 22 10:38:44 2006 +0100
    17.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Wed Mar 22 11:30:57 2006 +0100
    17.3 @@ -1,5 +1,29 @@
    17.4  /******************************************************************************
    17.5   * arch/xen/drivers/netif/backend/common.h
    17.6 + * 
    17.7 + * This program is free software; you can redistribute it and/or
    17.8 + * modify it under the terms of the GNU General Public License version 2
    17.9 + * as published by the Free Software Foundation; or, when distributed
   17.10 + * separately from the Linux kernel or incorporated into other
   17.11 + * software packages, subject to the following license:
   17.12 + * 
   17.13 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   17.14 + * of this source file (the "Software"), to deal in the Software without
   17.15 + * restriction, including without limitation the rights to use, copy, modify,
   17.16 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   17.17 + * and to permit persons to whom the Software is furnished to do so, subject to
   17.18 + * the following conditions:
   17.19 + * 
   17.20 + * The above copyright notice and this permission notice shall be included in
   17.21 + * all copies or substantial portions of the Software.
   17.22 + * 
   17.23 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   17.24 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   17.25 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   17.26 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   17.27 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   17.28 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   17.29 + * IN THE SOFTWARE.
   17.30   */
   17.31  
   17.32  #ifndef __NETIF__BACKEND__COMMON_H__

    18.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Wed Mar 22 10:38:44 2006 +0100
    18.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Wed Mar 22 11:30:57 2006 +0100
    18.3 @@ -4,6 +4,30 @@
    18.4   * Network-device interface management.
    18.5   * 
    18.6   * Copyright (c) 2004-2005, Keir Fraser
    18.7 + * 
    18.8 + * This program is free software; you can redistribute it and/or
    18.9 + * modify it under the terms of the GNU General Public License version 2
   18.10 + * as published by the Free Software Foundation; or, when distributed
   18.11 + * separately from the Linux kernel or incorporated into other
   18.12 + * software packages, subject to the following license:
   18.13 + * 
   18.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   18.15 + * of this source file (the "Software"), to deal in the Software without
   18.16 + * restriction, including without limitation the rights to use, copy, modify,
   18.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   18.18 + * and to permit persons to whom the Software is furnished to do so, subject to
   18.19 + * the following conditions:
   18.20 + * 
   18.21 + * The above copyright notice and this permission notice shall be included in
   18.22 + * all copies or substantial portions of the Software.
   18.23 + * 
   18.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   18.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   18.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   18.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   18.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   18.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   18.30 + * IN THE SOFTWARE.
   18.31   */
   18.32  
   18.33  #include "common.h"

    19.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c	Wed Mar 22 10:38:44 2006 +0100
    19.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c	Wed Mar 22 11:30:57 2006 +0100
    19.3 @@ -19,6 +19,30 @@
    19.4   * (to avoid confusing the Etherbridge).
    19.5   * 
    19.6   * Copyright (c) 2005 K A Fraser
    19.7 + * 
    19.8 + * This program is free software; you can redistribute it and/or
    19.9 + * modify it under the terms of the GNU General Public License version 2
   19.10 + * as published by the Free Software Foundation; or, when distributed
   19.11 + * separately from the Linux kernel or incorporated into other
   19.12 + * software packages, subject to the following license:
   19.13 + * 
   19.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   19.15 + * of this source file (the "Software"), to deal in the Software without
   19.16 + * restriction, including without limitation the rights to use, copy, modify,
   19.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   19.18 + * and to permit persons to whom the Software is furnished to do so, subject to
   19.19 + * the following conditions:
   19.20 + * 
   19.21 + * The above copyright notice and this permission notice shall be included in
   19.22 + * all copies or substantial portions of the Software.
   19.23 + * 
   19.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   19.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   19.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   19.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   19.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   19.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   19.30 + * IN THE SOFTWARE.
   19.31   */
   19.32  
   19.33  #include <linux/config.h>

    20.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed Mar 22 10:38:44 2006 +0100
    20.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed Mar 22 11:30:57 2006 +0100
    20.3 @@ -8,6 +8,30 @@
    20.4   *  drivers/xen/netfront/netfront.c
    20.5   * 
    20.6   * Copyright (c) 2002-2005, K A Fraser
    20.7 + * 
    20.8 + * This program is free software; you can redistribute it and/or
    20.9 + * modify it under the terms of the GNU General Public License version 2
   20.10 + * as published by the Free Software Foundation; or, when distributed
   20.11 + * separately from the Linux kernel or incorporated into other
   20.12 + * software packages, subject to the following license:
   20.13 + * 
   20.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   20.15 + * of this source file (the "Software"), to deal in the Software without
   20.16 + * restriction, including without limitation the rights to use, copy, modify,
   20.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   20.18 + * and to permit persons to whom the Software is furnished to do so, subject to
   20.19 + * the following conditions:
   20.20 + * 
   20.21 + * The above copyright notice and this permission notice shall be included in
   20.22 + * all copies or substantial portions of the Software.
   20.23 + * 
   20.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   20.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   20.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   20.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   20.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   20.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   20.30 + * IN THE SOFTWARE.
   20.31   */
   20.32  
   20.33  #include "common.h"

    21.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Wed Mar 22 10:38:44 2006 +0100
    21.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Wed Mar 22 11:30:57 2006 +0100
    21.3 @@ -8,9 +8,12 @@
    21.4   *
    21.5   * Copyright (c) 2002-2004, K A Fraser
    21.6   *
    21.7 - * This file may be distributed separately from the Linux kernel, or
    21.8 - * incorporated into other software packages, subject to the following license:
    21.9 - *
   21.10 + * This program is free software; you can redistribute it and/or
   21.11 + * modify it under the terms of the GNU General Public License version 2
   21.12 + * as published by the Free Software Foundation; or, when distributed
   21.13 + * separately from the Linux kernel or incorporated into other
   21.14 + * software packages, subject to the following license:
   21.15 + * 
   21.16   * Permission is hereby granted, free of charge, to any person obtaining a copy
   21.17   * of this source file (the "Software"), to deal in the Software without
   21.18   * restriction, including without limitation the rights to use, copy, modify,

    22.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Wed Mar 22 10:38:44 2006 +0100
    22.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Wed Mar 22 11:30:57 2006 +0100
    22.3 @@ -5,8 +5,11 @@
    22.4   *
    22.5   * Copyright (C) 2005 XenSource Ltd
    22.6   * 
    22.7 - * This file may be distributed separately from the Linux kernel, or
    22.8 - * incorporated into other software packages, subject to the following license:
    22.9 + * This program is free software; you can redistribute it and/or
   22.10 + * modify it under the terms of the GNU General Public License version 2
   22.11 + * as published by the Free Software Foundation; or, when distributed
   22.12 + * separately from the Linux kernel or incorporated into other
   22.13 + * software packages, subject to the following license:
   22.14   * 
   22.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   22.16   * of this source file (the "Software"), to deal in the Software without
   22.17 @@ -58,7 +61,7 @@ int xenbus_watch_path(struct xenbus_devi
   22.18  
   22.19  	return err;
   22.20  }
   22.21 -EXPORT_SYMBOL(xenbus_watch_path);
   22.22 +EXPORT_SYMBOL_GPL(xenbus_watch_path);
   22.23  
   22.24  
   22.25  int xenbus_watch_path2(struct xenbus_device *dev, const char *path,
   22.26 @@ -78,7 +81,7 @@ int xenbus_watch_path2(struct xenbus_dev
   22.27  		kfree(state);
   22.28  	return err;
   22.29  }
   22.30 -EXPORT_SYMBOL(xenbus_watch_path2);
   22.31 +EXPORT_SYMBOL_GPL(xenbus_watch_path2);
   22.32  
   22.33  
   22.34  int xenbus_switch_state(struct xenbus_device *dev,
   22.35 @@ -115,7 +118,7 @@ int xenbus_switch_state(struct xenbus_de
   22.36  
   22.37  	return 0;
   22.38  }
   22.39 -EXPORT_SYMBOL(xenbus_switch_state);
   22.40 +EXPORT_SYMBOL_GPL(xenbus_switch_state);
   22.41  
   22.42  
   22.43  /**
   22.44 @@ -178,7 +181,7 @@ void xenbus_dev_error(struct xenbus_devi
   22.45  	_dev_error(dev, err, fmt, ap);
   22.46  	va_end(ap);
   22.47  }
   22.48 -EXPORT_SYMBOL(xenbus_dev_error);
   22.49 +EXPORT_SYMBOL_GPL(xenbus_dev_error);
   22.50  
   22.51  
   22.52  void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
   22.53 @@ -192,7 +195,7 @@ void xenbus_dev_fatal(struct xenbus_devi
   22.54  
   22.55  	xenbus_switch_state(dev, XBT_NULL, XenbusStateClosing);
   22.56  }
   22.57 -EXPORT_SYMBOL(xenbus_dev_fatal);
   22.58 +EXPORT_SYMBOL_GPL(xenbus_dev_fatal);
   22.59  
   22.60  
   22.61  int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn)
   22.62 @@ -202,7 +205,7 @@ int xenbus_grant_ring(struct xenbus_devi
   22.63  		xenbus_dev_fatal(dev, err, "granting access to ring page");
   22.64  	return err;
   22.65  }
   22.66 -EXPORT_SYMBOL(xenbus_grant_ring);
   22.67 +EXPORT_SYMBOL_GPL(xenbus_grant_ring);
   22.68  
   22.69  
   22.70  int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port)
   22.71 @@ -219,7 +222,7 @@ int xenbus_alloc_evtchn(struct xenbus_de
   22.72  		*port = op.u.alloc_unbound.port;
   22.73  	return err;
   22.74  }
   22.75 -EXPORT_SYMBOL(xenbus_alloc_evtchn);
   22.76 +EXPORT_SYMBOL_GPL(xenbus_alloc_evtchn);
   22.77  
   22.78  
   22.79  int xenbus_bind_evtchn(struct xenbus_device *dev, int remote_port, int *port)
   22.80 @@ -238,7 +241,7 @@ int xenbus_bind_evtchn(struct xenbus_dev
   22.81  		*port = op.u.bind_interdomain.local_port;
   22.82  	return err;
   22.83  }
   22.84 -EXPORT_SYMBOL(xenbus_bind_evtchn);
   22.85 +EXPORT_SYMBOL_GPL(xenbus_bind_evtchn);
   22.86  
   22.87  
   22.88  int xenbus_free_evtchn(struct xenbus_device *dev, int port)
   22.89 @@ -290,7 +293,7 @@ int xenbus_map_ring_valloc(struct xenbus
   22.90  	*vaddr = area->addr;
   22.91  	return 0;
   22.92  }
   22.93 -EXPORT_SYMBOL(xenbus_map_ring_valloc);
   22.94 +EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
   22.95  
   22.96  
   22.97  int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
   22.98 @@ -314,7 +317,7 @@ int xenbus_map_ring(struct xenbus_device
   22.99  
  22.100  	return op.status;
  22.101  }
  22.102 -EXPORT_SYMBOL(xenbus_map_ring);
  22.103 +EXPORT_SYMBOL_GPL(xenbus_map_ring);
  22.104  
  22.105  
  22.106  /* Based on Rusty Russell's skeleton driver's unmap_page */
  22.107 @@ -359,7 +362,7 @@ int xenbus_unmap_ring_vfree(struct xenbu
  22.108  
  22.109  	return op.status;
  22.110  }
  22.111 -EXPORT_SYMBOL(xenbus_unmap_ring_vfree);
  22.112 +EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);
  22.113  
  22.114  
  22.115  int xenbus_unmap_ring(struct xenbus_device *dev,
  22.116 @@ -379,7 +382,7 @@ int xenbus_unmap_ring(struct xenbus_devi
  22.117  
  22.118  	return op.status;
  22.119  }
  22.120 -EXPORT_SYMBOL(xenbus_unmap_ring);
  22.121 +EXPORT_SYMBOL_GPL(xenbus_unmap_ring);
  22.122  
  22.123  
  22.124  XenbusState xenbus_read_driver_state(const char *path)
  22.125 @@ -391,7 +394,7 @@ XenbusState xenbus_read_driver_state(con
  22.126  
  22.127  	return result;
  22.128  }
  22.129 -EXPORT_SYMBOL(xenbus_read_driver_state);
  22.130 +EXPORT_SYMBOL_GPL(xenbus_read_driver_state);
  22.131  
  22.132  
  22.133  /*

    23.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c	Wed Mar 22 10:38:44 2006 +0100
    23.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c	Wed Mar 22 11:30:57 2006 +0100
    23.3 @@ -5,8 +5,11 @@
    23.4   *
    23.5   * Copyright (C) 2005 Rusty Russell, IBM Corporation
    23.6   * 
    23.7 - * This file may be distributed separately from the Linux kernel, or
    23.8 - * incorporated into other software packages, subject to the following license:
    23.9 + * This program is free software; you can redistribute it and/or
   23.10 + * modify it under the terms of the GNU General Public License version 2
   23.11 + * as published by the Free Software Foundation; or, when distributed
   23.12 + * separately from the Linux kernel or incorporated into other
   23.13 + * software packages, subject to the following license:
   23.14   * 
   23.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   23.16   * of this source file (the "Software"), to deal in the Software without

    24.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h	Wed Mar 22 10:38:44 2006 +0100
    24.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.h	Wed Mar 22 11:30:57 2006 +0100
    24.3 @@ -3,8 +3,11 @@
    24.4   * 
    24.5   * Copyright (C) 2005 Rusty Russell, IBM Corporation
    24.6   *
    24.7 - * This file may be distributed separately from the Linux kernel, or
    24.8 - * incorporated into other software packages, subject to the following license:
    24.9 + * This program is free software; you can redistribute it and/or
   24.10 + * modify it under the terms of the GNU General Public License version 2
   24.11 + * as published by the Free Software Foundation; or, when distributed
   24.12 + * separately from the Linux kernel or incorporated into other
   24.13 + * software packages, subject to the following license:
   24.14   * 
   24.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   24.16   * of this source file (the "Software"), to deal in the Software without

    25.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Wed Mar 22 10:38:44 2006 +0100
    25.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Wed Mar 22 11:30:57 2006 +0100
    25.3 @@ -7,8 +7,11 @@
    25.4   * Copyright (c) 2005, Christian Limpach
    25.5   * Copyright (c) 2005, Rusty Russell, IBM Corporation
    25.6   * 
    25.7 - * This file may be distributed separately from the Linux kernel, or
    25.8 - * incorporated into other software packages, subject to the following license:
    25.9 + * This program is free software; you can redistribute it and/or
   25.10 + * modify it under the terms of the GNU General Public License version 2
   25.11 + * as published by the Free Software Foundation; or, when distributed
   25.12 + * separately from the Linux kernel or incorporated into other
   25.13 + * software packages, subject to the following license:
   25.14   * 
   25.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   25.16   * of this source file (the "Software"), to deal in the Software without

    26.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Wed Mar 22 10:38:44 2006 +0100
    26.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Wed Mar 22 11:30:57 2006 +0100
    26.3 @@ -5,8 +5,11 @@
    26.4   * Copyright (C) 2005 Mike Wray, Hewlett-Packard
    26.5   * Copyright (C) 2005 XenSource Ltd
    26.6   * 
    26.7 - * This file may be distributed separately from the Linux kernel, or
    26.8 - * incorporated into other software packages, subject to the following license:
    26.9 + * This program is free software; you can redistribute it and/or
   26.10 + * modify it under the terms of the GNU General Public License version 2
   26.11 + * as published by the Free Software Foundation; or, when distributed
   26.12 + * separately from the Linux kernel or incorporated into other
   26.13 + * software packages, subject to the following license:
   26.14   * 
   26.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   26.16   * of this source file (the "Software"), to deal in the Software without
   26.17 @@ -408,7 +411,7 @@ int xenbus_register_frontend(struct xenb
   26.18  
   26.19  	return xenbus_register_driver_common(drv, &xenbus_frontend);
   26.20  }
   26.21 -EXPORT_SYMBOL(xenbus_register_frontend);
   26.22 +EXPORT_SYMBOL_GPL(xenbus_register_frontend);
   26.23  
   26.24  int xenbus_register_backend(struct xenbus_driver *drv)
   26.25  {
   26.26 @@ -416,13 +419,13 @@ int xenbus_register_backend(struct xenbu
   26.27  
   26.28  	return xenbus_register_driver_common(drv, &xenbus_backend);
   26.29  }
   26.30 -EXPORT_SYMBOL(xenbus_register_backend);
   26.31 +EXPORT_SYMBOL_GPL(xenbus_register_backend);
   26.32  
   26.33  void xenbus_unregister_driver(struct xenbus_driver *drv)
   26.34  {
   26.35  	driver_unregister(&drv->driver);
   26.36  }
   26.37 -EXPORT_SYMBOL(xenbus_unregister_driver);
   26.38 +EXPORT_SYMBOL_GPL(xenbus_unregister_driver);
   26.39  
   26.40  struct xb_find_info
   26.41  {
   26.42 @@ -845,7 +848,7 @@ void xenbus_suspend(void)
   26.43  	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
   26.44  	xs_suspend();
   26.45  }
   26.46 -EXPORT_SYMBOL(xenbus_suspend);
   26.47 +EXPORT_SYMBOL_GPL(xenbus_suspend);
   26.48  
   26.49  void xenbus_resume(void)
   26.50  {
   26.51 @@ -854,7 +857,7 @@ void xenbus_resume(void)
   26.52  	bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, resume_dev);
   26.53  	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, resume_dev);
   26.54  }
   26.55 -EXPORT_SYMBOL(xenbus_resume);
   26.56 +EXPORT_SYMBOL_GPL(xenbus_resume);
   26.57  
   26.58  
   26.59  /* A flag to determine if xenstored is 'ready' (i.e. has started) */
   26.60 @@ -872,13 +875,13 @@ int register_xenstore_notifier(struct no
   26.61  
   26.62  	return ret;
   26.63  }
   26.64 -EXPORT_SYMBOL(register_xenstore_notifier);
   26.65 +EXPORT_SYMBOL_GPL(register_xenstore_notifier);
   26.66  
   26.67  void unregister_xenstore_notifier(struct notifier_block *nb)
   26.68  {
   26.69  	notifier_chain_unregister(&xenstore_chain, nb);
   26.70  }
   26.71 -EXPORT_SYMBOL(unregister_xenstore_notifier);
   26.72 +EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
   26.73  
   26.74  
   26.75  static int all_devices_ready_(struct device *dev, void *data)

    27.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Wed Mar 22 10:38:44 2006 +0100
    27.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Wed Mar 22 11:30:57 2006 +0100
    27.3 @@ -6,8 +6,11 @@
    27.4   *
    27.5   * Copyright (C) 2005 Rusty Russell, IBM Corporation
    27.6   * 
    27.7 - * This file may be distributed separately from the Linux kernel, or
    27.8 - * incorporated into other software packages, subject to the following license:
    27.9 + * This program is free software; you can redistribute it and/or
   27.10 + * modify it under the terms of the GNU General Public License version 2
   27.11 + * as published by the Free Software Foundation; or, when distributed
   27.12 + * separately from the Linux kernel or incorporated into other
   27.13 + * software packages, subject to the following license:
   27.14   * 
   27.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   27.16   * of this source file (the "Software"), to deal in the Software without
   27.17 @@ -333,7 +336,7 @@ char **xenbus_directory(xenbus_transacti
   27.18  
   27.19  	return split(strings, len, num);
   27.20  }
   27.21 -EXPORT_SYMBOL(xenbus_directory);
   27.22 +EXPORT_SYMBOL_GPL(xenbus_directory);
   27.23  
   27.24  /* Check if a path exists. Return 1 if it does. */
   27.25  int xenbus_exists(xenbus_transaction_t t,
   27.26 @@ -348,7 +351,7 @@ int xenbus_exists(xenbus_transaction_t t
   27.27  	kfree(d);
   27.28  	return 1;
   27.29  }
   27.30 -EXPORT_SYMBOL(xenbus_exists);
   27.31 +EXPORT_SYMBOL_GPL(xenbus_exists);
   27.32  
   27.33  /* Get the value of a single file.
   27.34   * Returns a kmalloced value: call free() on it after use.
   27.35 @@ -368,7 +371,7 @@ void *xenbus_read(xenbus_transaction_t t
   27.36  	kfree(path);
   27.37  	return ret;
   27.38  }
   27.39 -EXPORT_SYMBOL(xenbus_read);
   27.40 +EXPORT_SYMBOL_GPL(xenbus_read);
   27.41  
   27.42  /* Write the value of a single file.
   27.43   * Returns -err on failure.
   27.44 @@ -393,7 +396,7 @@ int xenbus_write(xenbus_transaction_t t,
   27.45  	kfree(path);
   27.46  	return ret;
   27.47  }
   27.48 -EXPORT_SYMBOL(xenbus_write);
   27.49 +EXPORT_SYMBOL_GPL(xenbus_write);
   27.50  
   27.51  /* Create a new directory. */
   27.52  int xenbus_mkdir(xenbus_transaction_t t,
   27.53 @@ -410,7 +413,7 @@ int xenbus_mkdir(xenbus_transaction_t t,
   27.54  	kfree(path);
   27.55  	return ret;
   27.56  }
   27.57 -EXPORT_SYMBOL(xenbus_mkdir);
   27.58 +EXPORT_SYMBOL_GPL(xenbus_mkdir);
   27.59  
   27.60  /* Destroy a file or directory (directories must be empty). */
   27.61  int xenbus_rm(xenbus_transaction_t t, const char *dir, const char *node)
   27.62 @@ -426,7 +429,7 @@ int xenbus_rm(xenbus_transaction_t t, co
   27.63  	kfree(path);
   27.64  	return ret;
   27.65  }
   27.66 -EXPORT_SYMBOL(xenbus_rm);
   27.67 +EXPORT_SYMBOL_GPL(xenbus_rm);
   27.68  
   27.69  /* Start a transaction: changes by others will not be seen during this
   27.70   * transaction, and changes will not be visible to others until end.
   27.71 @@ -447,7 +450,7 @@ int xenbus_transaction_start(xenbus_tran
   27.72  	kfree(id_str);
   27.73  	return 0;
   27.74  }
   27.75 -EXPORT_SYMBOL(xenbus_transaction_start);
   27.76 +EXPORT_SYMBOL_GPL(xenbus_transaction_start);
   27.77  
   27.78  /* End a transaction.
   27.79   * If abandon is true, transaction is discarded instead of committed.
   27.80 @@ -468,7 +471,7 @@ int xenbus_transaction_end(xenbus_transa
   27.81  
   27.82  	return err;
   27.83  }
   27.84 -EXPORT_SYMBOL(xenbus_transaction_end);
   27.85 +EXPORT_SYMBOL_GPL(xenbus_transaction_end);
   27.86  
   27.87  /* Single read and scanf: returns -errno or num scanned. */
   27.88  int xenbus_scanf(xenbus_transaction_t t,
   27.89 @@ -491,7 +494,7 @@ int xenbus_scanf(xenbus_transaction_t t,
   27.90  		return -ERANGE;
   27.91  	return ret;
   27.92  }
   27.93 -EXPORT_SYMBOL(xenbus_scanf);
   27.94 +EXPORT_SYMBOL_GPL(xenbus_scanf);
   27.95  
   27.96  /* Single printf and write: returns -errno or 0. */
   27.97  int xenbus_printf(xenbus_transaction_t t,
   27.98 @@ -517,7 +520,7 @@ int xenbus_printf(xenbus_transaction_t t
   27.99  
  27.100  	return ret;
  27.101  }
  27.102 -EXPORT_SYMBOL(xenbus_printf);
  27.103 +EXPORT_SYMBOL_GPL(xenbus_printf);
  27.104  
  27.105  /* Takes tuples of names, scanf-style args, and void **, NULL terminated. */
  27.106  int xenbus_gather(xenbus_transaction_t t, const char *dir, ...)
  27.107 @@ -547,7 +550,7 @@ int xenbus_gather(xenbus_transaction_t t
  27.108  	va_end(ap);
  27.109  	return ret;
  27.110  }
  27.111 -EXPORT_SYMBOL(xenbus_gather);
  27.112 +EXPORT_SYMBOL_GPL(xenbus_gather);
  27.113  
  27.114  static int xs_watch(const char *path, const char *token)
  27.115  {
  27.116 @@ -617,7 +620,7 @@ int register_xenbus_watch(struct xenbus_
  27.117  
  27.118  	return err;
  27.119  }
  27.120 -EXPORT_SYMBOL(register_xenbus_watch);
  27.121 +EXPORT_SYMBOL_GPL(register_xenbus_watch);
  27.122  
  27.123  void unregister_xenbus_watch(struct xenbus_watch *watch)
  27.124  {
  27.125 @@ -659,7 +662,7 @@ void unregister_xenbus_watch(struct xenb
  27.126  		up(&xenwatch_mutex);
  27.127  	}
  27.128  }
  27.129 -EXPORT_SYMBOL(unregister_xenbus_watch);
  27.130 +EXPORT_SYMBOL_GPL(unregister_xenbus_watch);
  27.131  
  27.132  void xs_suspend(void)
  27.133  {

    28.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h	Wed Mar 22 10:38:44 2006 +0100
    28.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h	Wed Mar 22 11:30:57 2006 +0100
    28.3 @@ -5,8 +5,11 @@
    28.4   * 
    28.5   * Copyright (c) 2002-2004, K A Fraser
    28.6   * 
    28.7 - * This file may be distributed separately from the Linux kernel, or
    28.8 - * incorporated into other software packages, subject to the following license:
    28.9 + * This program is free software; you can redistribute it and/or
   28.10 + * modify it under the terms of the GNU General Public License version 2
   28.11 + * as published by the Free Software Foundation; or, when distributed
   28.12 + * separately from the Linux kernel or incorporated into other
   28.13 + * software packages, subject to the following license:
   28.14   * 
   28.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   28.16   * of this source file (the "Software"), to deal in the Software without

    29.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Wed Mar 22 10:38:44 2006 +0100
    29.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h	Wed Mar 22 11:30:57 2006 +0100
    29.3 @@ -5,8 +5,11 @@
    29.4   * 
    29.5   * Copyright (c) 2002-2004, K A Fraser
    29.6   * 
    29.7 - * This file may be distributed separately from the Linux kernel, or
    29.8 - * incorporated into other software packages, subject to the following license:
    29.9 + * This program is free software; you can redistribute it and/or
   29.10 + * modify it under the terms of the GNU General Public License version 2
   29.11 + * as published by the Free Software Foundation; or, when distributed
   29.12 + * separately from the Linux kernel or incorporated into other
   29.13 + * software packages, subject to the following license:
   29.14   * 
   29.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   29.16   * of this source file (the "Software"), to deal in the Software without

    30.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Wed Mar 22 10:38:44 2006 +0100
    30.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Wed Mar 22 11:30:57 2006 +0100
    30.3 @@ -5,8 +5,11 @@
    30.4   * 
    30.5   * Copyright (c) 2002-2004, K A Fraser
    30.6   * 
    30.7 - * This file may be distributed separately from the Linux kernel, or
    30.8 - * incorporated into other software packages, subject to the following license:
    30.9 + * This program is free software; you can redistribute it and/or
   30.10 + * modify it under the terms of the GNU General Public License version 2
   30.11 + * as published by the Free Software Foundation; or, when distributed
   30.12 + * separately from the Linux kernel or incorporated into other
   30.13 + * software packages, subject to the following license:
   30.14   * 
   30.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   30.16   * of this source file (the "Software"), to deal in the Software without

    31.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Wed Mar 22 10:38:44 2006 +0100
    31.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Wed Mar 22 11:30:57 2006 +0100
    31.3 @@ -5,8 +5,11 @@
    31.4   * 
    31.5   * Copyright (c) 2002-2004, K A Fraser
    31.6   * 
    31.7 - * This file may be distributed separately from the Linux kernel, or
    31.8 - * incorporated into other software packages, subject to the following license:
    31.9 + * This program is free software; you can redistribute it and/or
   31.10 + * modify it under the terms of the GNU General Public License version 2
   31.11 + * as published by the Free Software Foundation; or, when distributed
   31.12 + * separately from the Linux kernel or incorporated into other
   31.13 + * software packages, subject to the following license:
   31.14   * 
   31.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   31.16   * of this source file (the "Software"), to deal in the Software without

    32.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h	Wed Mar 22 10:38:44 2006 +0100
    32.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/hypercall.h	Wed Mar 22 11:30:57 2006 +0100
    32.3 @@ -9,8 +9,11 @@
    32.4   *   Benjamin Liu <benjamin.liu@intel.com>
    32.5   *   Jun Nakajima <jun.nakajima@intel.com>
    32.6   * 
    32.7 - * This file may be distributed separately from the Linux kernel, or
    32.8 - * incorporated into other software packages, subject to the following license:
    32.9 + * This program is free software; you can redistribute it and/or
   32.10 + * modify it under the terms of the GNU General Public License version 2
   32.11 + * as published by the Free Software Foundation; or, when distributed
   32.12 + * separately from the Linux kernel or incorporated into other
   32.13 + * software packages, subject to the following license:
   32.14   * 
   32.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   32.16   * of this source file (the "Software"), to deal in the Software without

    33.1 --- a/linux-2.6-xen-sparse/include/xen/balloon.h	Wed Mar 22 10:38:44 2006 +0100
    33.2 +++ b/linux-2.6-xen-sparse/include/xen/balloon.h	Wed Mar 22 11:30:57 2006 +0100
    33.3 @@ -6,8 +6,11 @@
    33.4   * Copyright (c) 2003, B Dragovic
    33.5   * Copyright (c) 2003-2004, M Williamson, K Fraser
    33.6   * 
    33.7 - * This file may be distributed separately from the Linux kernel, or
    33.8 - * incorporated into other software packages, subject to the following license:
    33.9 + * This program is free software; you can redistribute it and/or
   33.10 + * modify it under the terms of the GNU General Public License version 2
   33.11 + * as published by the Free Software Foundation; or, when distributed
   33.12 + * separately from the Linux kernel or incorporated into other
   33.13 + * software packages, subject to the following license:
   33.14   * 
   33.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   33.16   * of this source file (the "Software"), to deal in the Software without

    34.1 --- a/linux-2.6-xen-sparse/include/xen/evtchn.h	Wed Mar 22 10:38:44 2006 +0100
    34.2 +++ b/linux-2.6-xen-sparse/include/xen/evtchn.h	Wed Mar 22 11:30:57 2006 +0100
    34.3 @@ -6,8 +6,11 @@
    34.4   * 
    34.5   * Copyright (c) 2004-2005, K A Fraser
    34.6   * 
    34.7 - * This file may be distributed separately from the Linux kernel, or
    34.8 - * incorporated into other software packages, subject to the following license:
    34.9 + * This program is free software; you can redistribute it and/or
   34.10 + * modify it under the terms of the GNU General Public License version 2
   34.11 + * as published by the Free Software Foundation; or, when distributed
   34.12 + * separately from the Linux kernel or incorporated into other
   34.13 + * software packages, subject to the following license:
   34.14   * 
   34.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   34.16   * of this source file (the "Software"), to deal in the Software without

    35.1 --- a/linux-2.6-xen-sparse/include/xen/gnttab.h	Wed Mar 22 10:38:44 2006 +0100
    35.2 +++ b/linux-2.6-xen-sparse/include/xen/gnttab.h	Wed Mar 22 11:30:57 2006 +0100
    35.3 @@ -9,8 +9,11 @@
    35.4   * Copyright (c) 2004-2005, K A Fraser
    35.5   * Copyright (c) 2005, Christopher Clark
    35.6   * 
    35.7 - * This file may be distributed separately from the Linux kernel, or
    35.8 - * incorporated into other software packages, subject to the following license:
    35.9 + * This program is free software; you can redistribute it and/or
   35.10 + * modify it under the terms of the GNU General Public License version 2
   35.11 + * as published by the Free Software Foundation; or, when distributed
   35.12 + * separately from the Linux kernel or incorporated into other
   35.13 + * software packages, subject to the following license:
   35.14   * 
   35.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   35.16   * of this source file (the "Software"), to deal in the Software without

    36.1 --- a/linux-2.6-xen-sparse/include/xen/net_driver_util.h	Wed Mar 22 10:38:44 2006 +0100
    36.2 +++ b/linux-2.6-xen-sparse/include/xen/net_driver_util.h	Wed Mar 22 11:30:57 2006 +0100
    36.3 @@ -4,9 +4,11 @@
    36.4   *
    36.5   * Copyright (c) 2005 XenSource Ltd.
    36.6   * 
    36.7 - * This file may be distributed separately from the Linux kernel, or
    36.8 - * incorporated into other software packages, subject to the following
    36.9 - * license:
   36.10 + * This program is free software; you can redistribute it and/or
   36.11 + * modify it under the terms of the GNU General Public License version 2
   36.12 + * as published by the Free Software Foundation; or, when distributed
   36.13 + * separately from the Linux kernel or incorporated into other
   36.14 + * software packages, subject to the following license:
   36.15   * 
   36.16   * Permission is hereby granted, free of charge, to any person obtaining a
   36.17   * copy of this source file (the "Software"), to deal in the Software without

    37.1 --- a/linux-2.6-xen-sparse/include/xen/public/evtchn.h	Wed Mar 22 10:38:44 2006 +0100
    37.2 +++ b/linux-2.6-xen-sparse/include/xen/public/evtchn.h	Wed Mar 22 11:30:57 2006 +0100
    37.3 @@ -5,8 +5,11 @@
    37.4   * 
    37.5   * Copyright (c) 2003-2005, K A Fraser
    37.6   * 
    37.7 - * This file may be distributed separately from the Linux kernel, or
    37.8 - * incorporated into other software packages, subject to the following license:
    37.9 + * This program is free software; you can redistribute it and/or
   37.10 + * modify it under the terms of the GNU General Public License version 2
   37.11 + * as published by the Free Software Foundation; or, when distributed
   37.12 + * separately from the Linux kernel or incorporated into other
   37.13 + * software packages, subject to the following license:
   37.14   * 
   37.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   37.16   * of this source file (the "Software"), to deal in the Software without

    38.1 --- a/linux-2.6-xen-sparse/include/xen/public/privcmd.h	Wed Mar 22 10:38:44 2006 +0100
    38.2 +++ b/linux-2.6-xen-sparse/include/xen/public/privcmd.h	Wed Mar 22 11:30:57 2006 +0100
    38.3 @@ -5,8 +5,11 @@
    38.4   * 
    38.5   * Copyright (c) 2003-2005, K A Fraser
    38.6   * 
    38.7 - * This file may be distributed separately from the Linux kernel, or
    38.8 - * incorporated into other software packages, subject to the following license:
    38.9 + * This program is free software; you can redistribute it and/or
   38.10 + * modify it under the terms of the GNU General Public License version 2
   38.11 + * as published by the Free Software Foundation; or, when distributed
   38.12 + * separately from the Linux kernel or incorporated into other
   38.13 + * software packages, subject to the following license:
   38.14   * 
   38.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   38.16   * of this source file (the "Software"), to deal in the Software without

    39.1 --- a/linux-2.6-xen-sparse/include/xen/xenbus.h	Wed Mar 22 10:38:44 2006 +0100
    39.2 +++ b/linux-2.6-xen-sparse/include/xen/xenbus.h	Wed Mar 22 11:30:57 2006 +0100
    39.3 @@ -6,8 +6,11 @@
    39.4   * Copyright (C) 2005 Rusty Russell, IBM Corporation
    39.5   * Copyright (C) 2005 XenSource Ltd.
    39.6   * 
    39.7 - * This file may be distributed separately from the Linux kernel, or
    39.8 - * incorporated into other software packages, subject to the following license:
    39.9 + * This program is free software; you can redistribute it and/or
   39.10 + * modify it under the terms of the GNU General Public License version 2
   39.11 + * as published by the Free Software Foundation; or, when distributed
   39.12 + * separately from the Linux kernel or incorporated into other
   39.13 + * software packages, subject to the following license:
   39.14   * 
   39.15   * Permission is hereby granted, free of charge, to any person obtaining a copy
   39.16   * of this source file (the "Software"), to deal in the Software without