From patchwork Tue Sep 27 14:16:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Kurth X-Patchwork-Id: 9352005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBF816077B for ; Tue, 27 Sep 2016 14:20:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCEB5284BB for ; Tue, 27 Sep 2016 14:20:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF11A284C0; Tue, 27 Sep 2016 14:20:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02003284EB for ; Tue, 27 Sep 2016 14:20:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1botC6-0007ti-Hu; Tue, 27 Sep 2016 14:17:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1botC5-0007tc-NM for xen-devel@lists.xenproject.org; Tue, 27 Sep 2016 14:17:14 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 37/C6-17152-86F7AE75; Tue, 27 Sep 2016 14:17:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLLMWRWlGSWpSXmKPExsWS0XRdVTel/lW 4wX8vi+9bJjM5MHoc/nCFJYAxijUzLym/IoE149+soywFX94zV/zaMou1gXHtVOYuRi4OIYGT jBKPtzSwQDgXGSUObXjE2sXIycEmoCFx7GEzM4gtIqAkcW/VZCaQImaBfkaJN2862UESwgKuE uv37ANrYBFQldj+bC0LiM0LEn96mwnElhDQlbh78wLrBEbOBYwMqxg1ilOLylKLdI1M9ZKKMt MzSnITM3N0DQ2M9XJTi4sT01NzEpOK9ZLzczcxAr1Wz8DAuIOx9YTfIUZJDiYlUd7bZa/Chfi S8lMqMxKLM+KLSnNSiw8xynBwKEnwfqoFygkWpaanVqRl5gDDByYtwcGjJMKrXweU5i0uSMwt zkyHSJ1i1OVYteDGWiYhlrz8vFQpcd7DIDMEQIoySvPgRsBC+RKjrJQwLyMDA4MQT0FqUW5mC ar8K0ZxDkYlYV4TkFU8mXklcJteAR3BBHTE0hMvQI4oSURISTUw6l5ZwPxqAf80rnJJVs+0f1 eOH5sQ426wbUnzQvsV/FIt2U0R/pH2iqURx7/K/b3tkN09wZRJ3SNuC+shyd7rp1hq1Jbazip 4xFZ5xD+KVfq3W2XE35+yZseMHMovrFm4dqk76511bV2/Lj2LvWyw6aDvC4Z1ZkpySU4/Xnla ukzM9XG7f9tRiaU4I9FQi7moOBEA1hjfZGACAAA= X-Env-Sender: lars.kurth@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1474985826!62947174!1 X-Originating-IP: [104.130.215.37] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45867 invoked from network); 27 Sep 2016 14:17:07 -0000 Received: from mail.xenproject.org (HELO mail.xenproject.org) (104.130.215.37) by server-3.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2016 14:17:07 -0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1botBq-0004fc-ND; Tue, 27 Sep 2016 14:16:58 +0000 Received: from localhost ([127.0.0.1] helo=MacBook-Pro-6.Home) by xenbits.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1botBp-00064q-3J; Tue, 27 Sep 2016 14:16:58 +0000 From: Lars Kurth To: xen-devel@lists.xenproject.org Date: Tue, 27 Sep 2016 15:16:50 +0100 Message-Id: <1474985810-12289-1-git-send-email-lars.kurth@citrix.com> X-Mailer: git-send-email 2.5.4 (Apple Git-61) Cc: mdolan@linuxfoundation.org, julien.grall@arm.com, sstabellini@kernel.org, committers@xenproject.org, Lars Kurth Subject: [Xen-devel] [PATCH] xen/arm: Bring (c) headers in line with COPYING file X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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(-) 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 * 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 * 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 * 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 * 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 * 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 * - * 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 (dhowells@redhat.com) * * 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 #include 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 * 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 * 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 * 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 * 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 , 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * - * 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 * 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 * 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 * 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 * - * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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 * 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