xen/arm: Bring (c) headers in line with COPYING file

Commit Message

Lars Kurth Sept. 27, 2016, 2:16 p.m. UTC

The COPYING file in the main xen.git tree applies to most files in the
xen tree, including the ones in this patch. It states:

[1]
 * Note that the only valid version of the GPL as far as the files in
 * this repository are concerned is _this_ particular version of the
 * license (i.e., *only* v2, not v2.2 or v3.x or whatever), unless
 * explicitly otherwise stated.

We do not have any GPLv3+ files in the Xen source, with the exception of
Bison generated files, which have a Bison exception and are thus safe.

However, there are a minority of files that are specifically GPL-2.0+,
stating

[2]
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.

I could not find a single instance in our code base, which states

[3]
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * any later version.

It is impossible to know, what the intention of the contributor was
when a (c) header of form [2] was used. There are two possibilities
a) The contributor chose [2] intentionally
b) The contributor copied a header file from elsewhere (e.g. the FSF)
   without understanding all the implications
The latter is more likely, which is also why we recently introduced
the CONTRIBUTING file with correct (c) headers

In all cases in our code base, code with a (c) header of form [2] is
linked against pure GPLv2 files, which in practice means that the
resulting binaries are always GPLv2. In addition, [1] clarifies this.

[2] allows the Xen Project to specifically choose GPLv2 and to modify
the (c) headers to that effect without express permission of the (c)
holders. This proposed patch makes use of this property. It also gives
anyone the right, to copy files from the Xen Project into a another
codebase and to explicitly choose GPLv3 or a later version without
obtaining the permission of the (c) holders.

When large vendors go through their internal approval process to
decide whether to allow their employees to contribute to projects, they
tend to perform a license and/or patent review. Depending on the company,
that process can be very different for L/GPLv2 versus L/GPLv3 codebases
(which contains a broad expressed patent license and a "patent defense"
provision).

We had a concrete instance, where the approval process took excessively
long due to the use of [2] in a large number of files. The intention
of this patch is to avoid such delays in future, when other potential
contributors perform a license/patent review.

There is no downside to the project regarding this change, as our
codebase is primarily GPLv2. The change does however restrict the
freedom of people to copy files into other codebases which are not
GPLv2 or not GPLv2 compatible (such as GPLv3 codebases).

Common practice for changes like this, is to invite the community to
provide input and to execute the change, if there are no unresolvable
objections.

Note that I will prepare some more patches of this type, by functional
area to make it easier to add all the right maintainers to the CC
list, once we have a decision on this one.

Signed-off-by: Lars Kurth <[e-mail]>
---
 xen/arch/arm/acpi/boot.c                | 7 +++----
 xen/arch/arm/acpi/lib.c                 | 7 +++----
 xen/arch/arm/arm32/debug-8250.inc       | 7 +++----
 xen/arch/arm/arm32/debug-exynos4210.inc | 7 +++----
 xen/arch/arm/arm32/debug-pl011.inc      | 7 +++----
 xen/arch/arm/arm32/debug-scif.inc       | 7 +++----
 xen/arch/arm/arm32/debug.S              | 7 +++----
 xen/arch/arm/arm32/head.S               | 7 +++----
 xen/arch/arm/arm32/proc-caxx.c          | 7 +++----
 xen/arch/arm/arm32/proc-v7.S            | 7 +++----
 xen/arch/arm/arm32/traps.c              | 7 +++----
 xen/arch/arm/arm64/debug-8250.inc       | 7 +++----
 xen/arch/arm/arm64/debug-cadence.inc    | 7 +++----
 xen/arch/arm/arm64/debug-pl011.inc      | 7 +++----
 xen/arch/arm/arm64/debug.S              | 7 +++----
 xen/arch/arm/arm64/head.S               | 7 +++----
 xen/arch/arm/arm64/lib/find_next_bit.c  | 5 ++---
 xen/arch/arm/arm64/traps.c              | 7 +++----
 xen/arch/arm/cpu.c                      | 7 +++----
 xen/arch/arm/decode.c                   | 7 +++----
 xen/arch/arm/decode.h                   | 7 +++----
 xen/arch/arm/device.c                   | 7 +++----
 xen/arch/arm/domain.c                   | 7 +++----
 xen/arch/arm/efi/efi-dom0.c             | 7 +++----
 xen/arch/arm/gic-v2.c                   | 7 +++----
 xen/arch/arm/gic-v3.c                   | 7 +++----
 xen/arch/arm/gic.c                      | 7 +++----
 xen/arch/arm/io.c                       | 7 +++----
 xen/arch/arm/irq.c                      | 7 +++----
 xen/arch/arm/mm.c                       | 7 +++----
 xen/arch/arm/platform.c                 | 7 +++----
 xen/arch/arm/platforms/brcm.c           | 7 +++----
 xen/arch/arm/platforms/exynos5.c        | 7 +++----
 xen/arch/arm/platforms/midway.c         | 7 +++----
 xen/arch/arm/platforms/omap5.c          | 7 +++----
 xen/arch/arm/platforms/rcar2.c          | 7 +++----
 xen/arch/arm/platforms/seattle.c        | 7 +++----
 xen/arch/arm/platforms/sunxi.c          | 7 +++----
 xen/arch/arm/platforms/vexpress.c       | 7 +++----
 xen/arch/arm/platforms/xgene-storm.c    | 7 +++----
 xen/arch/arm/platforms/xilinx-zynqmp.c  | 7 +++----
 xen/arch/arm/processor.c                | 7 +++----
 xen/arch/arm/psci.c                     | 7 +++----
 xen/arch/arm/setup.c                    | 7 +++----
 xen/arch/arm/smc.S                      | 7 +++----
 xen/arch/arm/smpboot.c                  | 7 +++----
 xen/arch/arm/time.c                     | 7 +++----
 xen/arch/arm/traps.c                    | 7 +++----
 xen/arch/arm/vgic-v2.c                  | 7 +++----
 xen/arch/arm/vgic-v3.c                  | 7 +++----
 xen/arch/arm/vgic.c                     | 7 +++----
 xen/arch/arm/vpsci.c                    | 7 +++----
 xen/arch/arm/vtimer.c                   | 7 +++----
 xen/arch/arm/vtimer.h                   | 7 +++----
 xen/arch/arm/vuart.c                    | 7 +++----
 xen/arch/arm/vuart.h                    | 7 +++----
 xen/include/asm-arm/acpi.h              | 7 +++----
 xen/include/asm-arm/cadence-uart.h      | 7 +++----
 xen/include/asm-arm/exynos4210-uart.h   | 7 +++----
 xen/include/asm-arm/gic.h               | 7 +++----
 xen/include/asm-arm/gic_v3_defs.h       | 7 +++----
 xen/include/asm-arm/mmio.h              | 7 +++----
 xen/include/asm-arm/pl011-uart.h        | 7 +++----
 xen/include/asm-arm/procinfo.h          | 7 +++----
 xen/include/asm-arm/scif-uart.h         | 7 +++----
 xen/include/asm-arm/vgic.h              | 7 +++----
 66 files changed, 197 insertions(+), 263 deletions(-)

Comments

Konrad Rzeszutek Wilk Sept. 27, 2016, 3:35 p.m. UTC | #1

On Tue, Sep 27, 2016 at 03:16:50PM +0100, Lars Kurth wrote:
> The COPYING file in the main xen.git tree applies to most files in the
> xen tree, including the ones in this patch. It states:
> 
> [1]
>  * Note that the only valid version of the GPL as far as the files in
>  * this repository are concerned is _this_ particular version of the
>  * license (i.e., *only* v2, not v2.2 or v3.x or whatever), unless
>  * explicitly otherwise stated.
> 
> We do not have any GPLv3+ files in the Xen source, with the exception of
> Bison generated files, which have a Bison exception and are thus safe.
> 
> However, there are a minority of files that are specifically GPL-2.0+,
> stating
> 
> [2]
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>  * the Free Software Foundation; either version 2 of the License, or
>  * (at your option) any later version.
> 
> I could not find a single instance in our code base, which states
> 
> [3]
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>  * the Free Software Foundation; either version 2 of the License, or
>  * any later version.
> 
> It is impossible to know, what the intention of the contributor was
> when a (c) header of form [2] was used. There are two possibilities
> a) The contributor chose [2] intentionally
> b) The contributor copied a header file from elsewhere (e.g. the FSF)
>    without understanding all the implications
> The latter is more likely, which is also why we recently introduced
> the CONTRIBUTING file with correct (c) headers
> 
> In all cases in our code base, code with a (c) header of form [2] is
> linked against pure GPLv2 files, which in practice means that the
> resulting binaries are always GPLv2. In addition, [1] clarifies this.
> 
> [2] allows the Xen Project to specifically choose GPLv2 and to modify
> the (c) headers to that effect without express permission of the (c)
> holders. This proposed patch makes use of this property. It also gives

This patch hinges on the 'allow' part. That is that the Xen Project community
can choose to modify its headers without express permission of the holders
on removing the '(at your option)' statement from the license headers.
Now it is not a relicense, nor changing the license but clarifying the semantics
of how the code can be used in future.

Later in the description (see 'annotated' tags) are saying the same
thing - that the community can decide this based on 'common practices'.

Could you please point me to the 'common practices' and the 'allow' property?
I would naively assume that this had happend in the past with other projects?
Or perhaps the GPL had helpfully put a statement on their website giving
clarification on this?

Thanks!

> anyone the right, to copy files from the Xen Project into a another
> codebase and to explicitly choose GPLv3 or a later version without
> obtaining the permission of the (c) holders.
> 
> When large vendors go through their internal approval process to
> decide whether to allow their employees to contribute to projects, they
> tend to perform a license and/or patent review. Depending on the company,
> that process can be very different for L/GPLv2 versus L/GPLv3 codebases
> (which contains a broad expressed patent license and a "patent defense"
> provision).
> 
> We had a concrete instance, where the approval process took excessively
> long due to the use of [2] in a large number of files. The intention
> of this patch is to avoid such delays in future, when other potential
> contributors perform a license/patent review.
> 
> There is no downside to the project regarding this change, as our
> codebase is primarily GPLv2. The change does however restrict the
> freedom of people to copy files into other codebases which are not
> GPLv2 or not GPLv2 compatible (such as GPLv3 codebases).
> 

<annotate>
> Common practice for changes like this, is to invite the community to
> provide input and to execute the change, if there are no unresolvable
> objections.
</annotate>

> 
> Note that I will prepare some more patches of this type, by functional
> area to make it easier to add all the right maintainers to the CC
> list, once we have a decision on this one.

<snip>

Lars Kurth Sept. 27, 2016, 4:14 p.m. UTC | #2

On 27/09/2016 16:35, "Konrad Rzeszutek Wilk" <[e-mail]>
wrote:

>On Tue, Sep 27, 2016 at 03:16:50PM +0100, Lars Kurth wrote:

>> The COPYING file in the main xen.git tree applies to most files in the

>> xen tree, including the ones in this patch. It states:

>> 

>> [1]

>>  * Note that the only valid version of the GPL as far as the files in

>>  * this repository are concerned is _this_ particular version of the

>>  * license (i.e., *only* v2, not v2.2 or v3.x or whatever), unless

>>  * explicitly otherwise stated.

>> 

>> We do not have any GPLv3+ files in the Xen source, with the exception of

>> Bison generated files, which have a Bison exception and are thus safe.

>> 

>> However, there are a minority of files that are specifically GPL-2.0+,

>> stating

>> 

>> [2]

>>  * This program is free software; you can redistribute it and/or modify

>>  * it under the terms of the GNU General Public License as published by

>>  * the Free Software Foundation; either version 2 of the License, or

>>  * (at your option) any later version.

>> 

>> I could not find a single instance in our code base, which states

>> 

>> [3]

>>  * This program is free software; you can redistribute it and/or modify

>>  * it under the terms of the GNU General Public License as published by

>>  * the Free Software Foundation; either version 2 of the License, or

>>  * any later version.

>> 

>> It is impossible to know, what the intention of the contributor was

>> when a (c) header of form [2] was used. There are two possibilities

>> a) The contributor chose [2] intentionally

>> b) The contributor copied a header file from elsewhere (e.g. the FSF)

>>    without understanding all the implications

>> The latter is more likely, which is also why we recently introduced

>> the CONTRIBUTING file with correct (c) headers

>> 

>> In all cases in our code base, code with a (c) header of form [2] is

>> linked against pure GPLv2 files, which in practice means that the

>> resulting binaries are always GPLv2. In addition, [1] clarifies this.

>> 

>> [2] allows the Xen Project to specifically choose GPLv2 and to modify

>> the (c) headers to that effect without express permission of the (c)

>> holders. This proposed patch makes use of this property. It also gives

>

>This patch hinges on the 'allow' part. That is that the Xen Project

>community

>can choose to modify its headers without express permission of the holders

>on removing the '(at your option)' statement from the license headers.

>Now it is not a relicense, nor changing the license but clarifying the

>semantics

>of how the code can be used in future.


That is correct. 

>Later in the description (see 'annotated' tags) are saying the same

>thing - that the community can decide this based on 'common practices'.

>

>Could you please point me to the 'common practices' and the 'allow'

>property?

>I would naively assume that this had happend in the past with other

>projects?

>Or perhaps the GPL had helpfully put a statement on their website giving

>clarification on this?


Unfortunately, the FSF FAQ does not cover this explicitly.

However, https://copyleft.org/guide/comprehensive-gpl-guidech3.html
Section 2.6, bullet point 3 does.

<quote>
2.6 The Innovation of Optional “Or Any Later” Version

An interesting fact of all GPL licenses is that there are ultimately
multiple choices for use of the license. The FSF is the primary steward
of GPL (as discussed later in § 8.1 and § 9.17). However, those who wish
to license works under GPL are not required to automatically accept
changes made by the FSF for their own copyrighted works. Each licensor may
chose three different methods of licensing, as follows:

* explicitly name a single version of GPL for their work (usually
  indicated in shorthand by saying the license is “GPLvX-only”), or
* name no version of the GPL, thus they allow their downstream recipients
  to select any version of the GPL they choose (usually indicated in
  shorthand by saying the license is simply “GPL”), or
* name a specific version of GPL and give downstream recipients the
  option to choose that version “or any later version as published
  by the FSF” (usually indicated by saying the license is
  “GPLvX-or-later”)


</quote>

As for the process, I don't know of a precedent. Maybe someone on the
list does have an example though.

Our community consists of both downstream recipients and (c) holders
and we don't know how downstream recipients use the code. If for example
a downstream recipient makes use of the GPLv2+ property, by copying
some files into a GPLv3 codebase, then we would restrict their freedom
and force them to fork the code. Older versions of those files in git
would still have that GPLv2+ property, but once we change the (c)
headers, inbound changes to those files would be made under the GPLv2
only from that point onwards.


My understanding was that legally, we don't need to follow this process,
but we don't want to unintentionally hurt any user making use of this
property. And as a community, we may not want to restrict an existing
freedom. Thus, it's fundamentally just common sense to deal with
such an issue through a consultation.

I don't expect this patch to go into Xen 4.8. I just needed to make
a start on this discussion, and get some views as this has been on
my TODO list for a while.


If this is not sufficient, the Advisory Board may need to pay for
a legal counsel to settle that question. But there is little point
in doing so, if there are major objections on the principle.


Best Regards
Lars

>Thanks!

>

>> anyone the right, to copy files from the Xen Project into a another

>> codebase and to explicitly choose GPLv3 or a later version without

>> obtaining the permission of the (c) holders.

>> 

>> When large vendors go through their internal approval process to

>> decide whether to allow their employees to contribute to projects, they

>> tend to perform a license and/or patent review. Depending on the

>>company,

>> that process can be very different for L/GPLv2 versus L/GPLv3 codebases

>> (which contains a broad expressed patent license and a "patent defense"

>> provision).

>> 

>> We had a concrete instance, where the approval process took excessively

>> long due to the use of [2] in a large number of files. The intention

>> of this patch is to avoid such delays in future, when other potential

>> contributors perform a license/patent review.

>> 

>> There is no downside to the project regarding this change, as our

>> codebase is primarily GPLv2. The change does however restrict the

>> freedom of people to copy files into other codebases which are not

>> GPLv2 or not GPLv2 compatible (such as GPLv3 codebases).

>> 

>

><annotate>

>> Common practice for changes like this, is to invite the community to

>> provide input and to execute the change, if there are no unresolvable

>> objections.

></annotate>

>

>> 

>> Note that I will prepare some more patches of this type, by functional

>> area to make it easier to add all the right maintainers to the CC

>> list, once we have a decision on this one.

>

><snip>

Patch

diff --git a/xen/arch/arm/acpi/boot.c b/xen/arch/arm/acpi/boot.c
index c3242a0..f0158fc 100644
--- a/xen/arch/arm/acpi/boot.c
+++ b/xen/arch/arm/acpi/boot.c
@@ -8,10 +8,9 @@ 
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms and conditions of the GNU General Public
+ *  License, version 2, as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/acpi/lib.c b/xen/arch/arm/acpi/lib.c
index 79f7edd..283c2a3 100644
--- a/xen/arch/arm/acpi/lib.c
+++ b/xen/arch/arm/acpi/lib.c
@@ -5,10 +5,9 @@ 
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms and conditions of the GNU General Public
+ *  License, version 2, as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/debug-8250.inc b/xen/arch/arm/arm32/debug-8250.inc
index 757ffd8..0359db5 100644
--- a/xen/arch/arm/arm32/debug-8250.inc
+++ b/xen/arch/arm/arm32/debug-8250.inc
@@ -3,10 +3,9 @@ 
  *
  * 8250 specific debug code
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/debug-exynos4210.inc b/xen/arch/arm/arm32/debug-exynos4210.inc
index 752942d..6d78f5d 100644
--- a/xen/arch/arm/arm32/debug-exynos4210.inc
+++ b/xen/arch/arm/arm32/debug-exynos4210.inc
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2013 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/debug-pl011.inc b/xen/arch/arm/arm32/debug-pl011.inc
index 6a64dbf..302c08e 100644
--- a/xen/arch/arm/arm32/debug-pl011.inc
+++ b/xen/arch/arm/arm32/debug-pl011.inc
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2013 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/debug-scif.inc b/xen/arch/arm/arm32/debug-scif.inc
index ce85752..986686e 100644
--- a/xen/arch/arm/arm32/debug-scif.inc
+++ b/xen/arch/arm/arm32/debug-scif.inc
@@ -6,10 +6,9 @@ 
  * Oleksandr Tyshchenko <[e-mail]>
  * Copyright (C) 2014, Globallogic.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/debug.S b/xen/arch/arm/arm32/debug.S
index a95d9da..bcbe608 100644
--- a/xen/arch/arm/arm32/debug.S
+++ b/xen/arch/arm/arm32/debug.S
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S
index e1f29bd..3ad7c3c 100644
--- a/xen/arch/arm/arm32/head.S
+++ b/xen/arch/arm/arm32/head.S
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/proc-caxx.c b/xen/arch/arm/arm32/proc-caxx.c
index 9166a1d..ce2adfd 100644
--- a/xen/arch/arm/arm32/proc-caxx.c
+++ b/xen/arch/arm/arm32/proc-caxx.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (c) 2014 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S
index 2f3ff1e..1cc85a8 100644
--- a/xen/arch/arm/arm32/proc-v7.S
+++ b/xen/arch/arm/arm32/proc-v7.S
@@ -6,10 +6,9 @@ 
  *
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c
index f8cf864..748668d 100644
--- a/xen/arch/arm/arm32/traps.c
+++ b/xen/arch/arm/arm32/traps.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2012 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/debug-8250.inc b/xen/arch/arm/arm64/debug-8250.inc
index 158549a..1567c70 100644
--- a/xen/arch/arm/arm64/debug-8250.inc
+++ b/xen/arch/arm/arm64/debug-8250.inc
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2013 Applied Micro.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/debug-cadence.inc b/xen/arch/arm/arm64/debug-cadence.inc
index 84dee4c..e083d94 100644
--- a/xen/arch/arm/arm64/debug-cadence.inc
+++ b/xen/arch/arm/arm64/debug-cadence.inc
@@ -6,10 +6,9 @@ 
  * Copyright (c) 2015 Xilinx Inc.
  * Written by Edgar E. Iglesias.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-pl011.inc
index b416235..90fe700 100644
--- a/xen/arch/arm/arm64/debug-pl011.inc
+++ b/xen/arch/arm/arm64/debug-pl011.inc
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2013 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S
index a855358..3f13d89 100644
--- a/xen/arch/arm/arm64/debug.S
+++ b/xen/arch/arm/arm64/debug.S
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 3f63d2a..8c77a27 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -9,10 +9,9 @@ 
  * Based on ARMv7-A head.S by
  * Tim Deegan <[e-mail]>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/arm64/lib/find_next_bit.c b/xen/arch/arm/arm64/lib/find_next_bit.c
index aea69c2..e591461 100644
--- a/xen/arch/arm/arm64/lib/find_next_bit.c
+++ b/xen/arch/arm/arm64/lib/find_next_bit.c
@@ -4,9 +4,8 @@ 
  * Written by David Howells ([e-mail])
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
  */
 #include <xen/config.h>
 #include <xen/bitops.h>
diff --git a/xen/arch/arm/arm64/traps.c b/xen/arch/arm/arm64/traps.c
index 5a90cfa..cf3e08b 100644
--- a/xen/arch/arm/arm64/traps.c
+++ b/xen/arch/arm/arm64/traps.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2012 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/cpu.c b/xen/arch/arm/cpu.c
index d21651c..8df4e95 100644
--- a/xen/arch/arm/cpu.c
+++ b/xen/arch/arm/cpu.c
@@ -1,8 +1,7 @@ 
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/decode.c b/xen/arch/arm/decode.c
index c6f49a5..4e7941d 100644
--- a/xen/arch/arm/decode.c
+++ b/xen/arch/arm/decode.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (C) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/decode.h b/xen/arch/arm/decode.h
index 4613763..9326792 100644
--- a/xen/arch/arm/decode.h
+++ b/xen/arch/arm/decode.h
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (C) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/device.c b/xen/arch/arm/device.c
index a0072c1..e662023 100644
--- a/xen/arch/arm/device.c
+++ b/xen/arch/arm/device.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (C) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 20bb2ba..50f7324 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -1,8 +1,7 @@ 
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/efi/efi-dom0.c b/xen/arch/arm/efi/efi-dom0.c
index c40a7c5..c6e0635 100644
--- a/xen/arch/arm/efi/efi-dom0.c
+++ b/xen/arch/arm/efi/efi-dom0.c
@@ -5,10 +5,9 @@ 
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms and conditions of the GNU General Public
+ *  License, version 2, as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 9bd9d0b..f0d080e 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index b8be395..f48096df 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -10,10 +10,9 @@ 
  * Vijaya Kumar K <[e-mail]>, Cavium Inc
  * ported to Xen
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 63c744a..571744f 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c
index e8aa7fa..fd25032 100644
--- a/xen/arch/arm/io.c
+++ b/xen/arch/arm/io.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 06d4843..85fe49e 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 99588a3..8e46bfa 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c
index b0bfaa9..7a87e6d 100644
--- a/xen/arch/arm/platform.c
+++ b/xen/arch/arm/platform.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (C) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/brcm.c b/xen/arch/arm/platforms/brcm.c
index 6d8b5b9..ae05ea8 100644
--- a/xen/arch/arm/platforms/brcm.c
+++ b/xen/arch/arm/platforms/brcm.c
@@ -6,10 +6,9 @@ 
  * Jon Fraser  <[e-mail]>
  * Copyright (c) 2013-2014 Broadcom Corporation
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c
index c43934f..f934f6a 100644
--- a/xen/arch/arm/platforms/exynos5.c
+++ b/xen/arch/arm/platforms/exynos5.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c
index b221279..3d0498e 100644
--- a/xen/arch/arm/platforms/midway.c
+++ b/xen/arch/arm/platforms/midway.c
@@ -6,10 +6,9 @@ 
  * Andre Przywara <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c
index 539588e..b160d45 100644
--- a/xen/arch/arm/platforms/omap5.c
+++ b/xen/arch/arm/platforms/omap5.c
@@ -6,10 +6,9 @@ 
  * Chen Baozi <[e-mail]>
  * Copyright (c) 2013
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/rcar2.c b/xen/arch/arm/platforms/rcar2.c
index bb25751..51c6e35 100644
--- a/xen/arch/arm/platforms/rcar2.c
+++ b/xen/arch/arm/platforms/rcar2.c
@@ -5,10 +5,9 @@ 
  *
  * Iurii Konovalenko <[e-mail]>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/seattle.c b/xen/arch/arm/platforms/seattle.c
index 86dce91..d3fcb14 100644
--- a/xen/arch/arm/platforms/seattle.c
+++ b/xen/arch/arm/platforms/seattle.c
@@ -6,10 +6,9 @@ 
  * Suravee Suthikulpanit <[e-mail]>
  * Copyright (c) 2014 Advance Micro Devices Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/sunxi.c b/xen/arch/arm/platforms/sunxi.c
index 0ba7b3d..9a902b5 100644
--- a/xen/arch/arm/platforms/sunxi.c
+++ b/xen/arch/arm/platforms/sunxi.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2013 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c
index 8e6a4ea..27bc69e 100644
--- a/xen/arch/arm/platforms/vexpress.c
+++ b/xen/arch/arm/platforms/vexpress.c
@@ -6,10 +6,9 @@ 
  * Stefano Stabellini <[e-mail]>
  * Copyright (c) 2013 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c
index 686b19b..23cc532 100644
--- a/xen/arch/arm/platforms/xgene-storm.c
+++ b/xen/arch/arm/platforms/xgene-storm.c
@@ -7,10 +7,9 @@ 
  * Anup Patel <[e-mail]>
  * Copyright (c) 2013 Applied Micro.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/platforms/xilinx-zynqmp.c b/xen/arch/arm/platforms/xilinx-zynqmp.c
index 2adee91..62f5e9c 100644
--- a/xen/arch/arm/platforms/xilinx-zynqmp.c
+++ b/xen/arch/arm/platforms/xilinx-zynqmp.c
@@ -6,10 +6,9 @@ 
  * Copyright (c) 2016 Xilinx Inc.
  * Written by Edgar E. Iglesias <[e-mail]>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/processor.c b/xen/arch/arm/processor.c
index 8c425ce..4fff804 100644
--- a/xen/arch/arm/processor.c
+++ b/xen/arch/arm/processor.c
@@ -6,10 +6,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (C) 2014 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c
index 7966b5e..c9945d8 100644
--- a/xen/arch/arm/psci.c
+++ b/xen/arch/arm/psci.c
@@ -6,10 +6,9 @@ 
  * Andre Przywara <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 38eb888..5b0fc20 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/smc.S b/xen/arch/arm/smc.S
index b8f1822..5c92522 100644
--- a/xen/arch/arm/smc.S
+++ b/xen/arch/arm/smc.S
@@ -3,10 +3,9 @@ 
  *
  * Wrapper for Secure Monitors Calls
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 90ad1d0..b58db6c 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 7dae28b..943c06b 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -6,10 +6,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 39a05fd..87f8e2c 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
index c6d280e..d8840c3 100644
--- a/xen/arch/arm/vgic-v2.c
+++ b/xen/arch/arm/vgic-v2.c
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
index ec038a3..d5ce937 100644
--- a/xen/arch/arm/vgic-v3.c
+++ b/xen/arch/arm/vgic-v3.c
@@ -7,10 +7,9 @@ 
  * Vijaya Kumar K <[e-mail]>
  * Copyright (c) 2014 Cavium Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 0965119..c94fa01 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c
index 0e024f7..262907a 100644
--- a/xen/arch/arm/vpsci.c
+++ b/xen/arch/arm/vpsci.c
@@ -1,8 +1,7 @@ 
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index f636705..1979770 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h
index 99e8145..f03699f 100644
--- a/xen/arch/arm/vtimer.h
+++ b/xen/arch/arm/vtimer.h
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c
index b5c9288..c03df47 100644
--- a/xen/arch/arm/vuart.c
+++ b/xen/arch/arm/vuart.c
@@ -20,10 +20,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2012 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/arch/arm/vuart.h b/xen/arch/arm/vuart.h
index bd23bd9..6779251 100644
--- a/xen/arch/arm/vuart.h
+++ b/xen/arch/arm/vuart.h
@@ -6,10 +6,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2012 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/acpi.h b/xen/include/asm-arm/acpi.h
index 9f954d3..de2ecf8 100644
--- a/xen/include/asm-arm/acpi.h
+++ b/xen/include/asm-arm/acpi.h
@@ -3,10 +3,9 @@ 
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms and conditions of the GNU General Public
+ *  License, version 2, as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/cadence-uart.h b/xen/include/asm-arm/cadence-uart.h
index 48680ee..6f0ec7a 100644
--- a/xen/include/asm-arm/cadence-uart.h
+++ b/xen/include/asm-arm/cadence-uart.h
@@ -4,10 +4,9 @@ 
  * Written by Edgar E. Iglesias <[e-mail]>
  * Copyright (C) 2015 Xilinx Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/exynos4210-uart.h b/xen/include/asm-arm/exynos4210-uart.h
index e2ab4a4..b5c4fb7 100644
--- a/xen/include/asm-arm/exynos4210-uart.h
+++ b/xen/include/asm-arm/exynos4210-uart.h
@@ -7,10 +7,9 @@ 
  * Julien Grall <[e-mail]>
  * Copyright (c) 2013 Linaro Limited.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 836a103..579d009 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -4,10 +4,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h
index 6bd25a5..61c9dbe 100644
--- a/xen/include/asm-arm/gic_v3_defs.h
+++ b/xen/include/asm-arm/gic_v3_defs.h
@@ -4,10 +4,9 @@ 
  * Vijaya Kumar K <[e-mail]>
  * Copyright (c) 2014 Cavium Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/mmio.h b/xen/include/asm-arm/mmio.h
index c620eed..bce9dd4 100644
--- a/xen/include/asm-arm/mmio.h
+++ b/xen/include/asm-arm/mmio.h
@@ -5,10 +5,9 @@ 
  *
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/pl011-uart.h b/xen/include/asm-arm/pl011-uart.h
index 123f477..b1673e1 100644
--- a/xen/include/asm-arm/pl011-uart.h
+++ b/xen/include/asm-arm/pl011-uart.h
@@ -7,10 +7,9 @@ 
  * Tim Deegan <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/procinfo.h b/xen/include/asm-arm/procinfo.h
index 26306b3..f28acbd 100644
--- a/xen/include/asm-arm/procinfo.h
+++ b/xen/include/asm-arm/procinfo.h
@@ -7,10 +7,9 @@ 
  * base on linux/arch/arm/include/asm/procinfo.h
  * Copyright (C) 1996-1999 Russell King
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/scif-uart.h b/xen/include/asm-arm/scif-uart.h
index d030b26..c2e7f1b 100644
--- a/xen/include/asm-arm/scif-uart.h
+++ b/xen/include/asm-arm/scif-uart.h
@@ -7,10 +7,9 @@ 
  * Oleksandr Tyshchenko <[e-mail]>
  * Copyright (C) 2014, Globallogic.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 300f461..b74ee7e 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -4,10 +4,9 @@ 
  * Ian Campbell <[e-mail]>
  * Copyright (c) 2011 Citrix Systems.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of