* [PATCH kvm-unit-tests] arm/arm64: code derived from Linux must be GPL not LGPL
@ 2017-05-29 15:48 Andrew Jones
2017-06-07 14:25 ` Radim Krčmář
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Jones @ 2017-05-29 15:48 UTC (permalink / raw)
To: kvm; +Cc: pbonzini, rkrcmar, thuth
Also update copyrights.
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
arm/cstart64.S | 4 ++--
lib/arm/asm-offsets.c | 4 ++--
lib/arm/asm/barrier.h | 4 ++++
lib/arm/asm/bitops.h | 4 ++--
lib/arm/asm/pgtable-hwdef.h | 4 ++++
lib/arm/asm/pgtable.h | 4 ++++
lib/arm/asm/ptrace.h | 4 ++++
lib/arm/asm/sysreg.h | 4 ++++
lib/arm/asm/thread_info.h | 4 ++--
lib/arm/bitops.c | 6 +++---
lib/arm/eabi_compat.c | 4 ++++
lib/arm64/asm-offsets.c | 4 ++--
lib/arm64/asm/barrier.h | 4 ++++
lib/arm64/asm/bitops.h | 4 ++--
lib/arm64/asm/esr.h | 4 ++++
lib/arm64/asm/io.h | 4 ++++
lib/arm64/asm/page.h | 4 ++--
lib/arm64/asm/pgtable-hwdef.h | 5 +++++
lib/arm64/asm/pgtable.h | 4 ++++
lib/arm64/asm/ptrace.h | 4 ++++
lib/asm-generic/io.h | 4 ++--
lib/asm-generic/page.h | 4 ++--
lib/bitops.h | 6 +++---
lib/virtio-mmio.c | 4 ++--
lib/virtio-mmio.h | 4 ++--
lib/virtio.c | 4 ++--
lib/virtio.h | 4 ++--
27 files changed, 81 insertions(+), 32 deletions(-)
diff --git a/arm/cstart64.S b/arm/cstart64.S
index 30f732f1e99b..8fed51ae0a36 100644
--- a/arm/cstart64.S
+++ b/arm/cstart64.S
@@ -1,9 +1,9 @@
/*
* Boot entry point and assembler functions for aarch64 tests.
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#define __ASSEMBLY__
#include <asm/asm-offsets.h>
diff --git a/lib/arm/asm-offsets.c b/lib/arm/asm-offsets.c
index 1ee9da070f60..6439e1c45ae6 100644
--- a/lib/arm/asm-offsets.c
+++ b/lib/arm/asm-offsets.c
@@ -1,9 +1,9 @@
/*
* Adapted from arch/arm/kernel/asm-offsets.c
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <libcflat.h>
#include <kbuild.h>
diff --git a/lib/arm/asm/barrier.h b/lib/arm/asm/barrier.h
index 927cd3801dfb..7f8683142d80 100644
--- a/lib/arm/asm/barrier.h
+++ b/lib/arm/asm/barrier.h
@@ -2,6 +2,10 @@
#define _ASMARM_BARRIER_H_
/*
* Adapted from arch/arm/include/asm/barrier.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#define sev() asm volatile("sev" : : : "memory")
diff --git a/lib/arm/asm/bitops.h b/lib/arm/asm/bitops.h
index d46cc5dacaf8..17be71272541 100644
--- a/lib/arm/asm/bitops.h
+++ b/lib/arm/asm/bitops.h
@@ -4,9 +4,9 @@
* Adapated from
* arch/arm/lib/bitops.h
*
- * Copyright (C) 2015, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#ifndef _BITOPS_H_
diff --git a/lib/arm/asm/pgtable-hwdef.h b/lib/arm/asm/pgtable-hwdef.h
index 13a273d36e8f..c08e6e2c01b4 100644
--- a/lib/arm/asm/pgtable-hwdef.h
+++ b/lib/arm/asm/pgtable-hwdef.h
@@ -3,6 +3,10 @@
/*
* From arch/arm/include/asm/pgtable-3level.h
* arch/arm/include/asm/pgtable-3level-hwdef.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#define PTRS_PER_PGD 4
diff --git a/lib/arm/asm/pgtable.h b/lib/arm/asm/pgtable.h
index 8a730f44e537..5af4b9bf28bc 100644
--- a/lib/arm/asm/pgtable.h
+++ b/lib/arm/asm/pgtable.h
@@ -9,6 +9,10 @@
* Note: some Linux function APIs have been modified. Nothing crazy,
* but if a function took, for example, an mm_struct, then
* that was either removed or replaced.
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <alloc.h>
#include <asm/setup.h>
diff --git a/lib/arm/asm/ptrace.h b/lib/arm/asm/ptrace.h
index 9ee71c760d22..02bb2ccb0c2f 100644
--- a/lib/arm/asm/ptrace.h
+++ b/lib/arm/asm/ptrace.h
@@ -4,6 +4,10 @@
* Adapted from Linux kernel headers
* arch/arm/include/asm/ptrace.h
* arch/arm/include/uapi/asm/ptrace.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
/*
diff --git a/lib/arm/asm/sysreg.h b/lib/arm/asm/sysreg.h
index 9344968fa5c5..9684338636da 100644
--- a/lib/arm/asm/sysreg.h
+++ b/lib/arm/asm/sysreg.h
@@ -3,6 +3,10 @@
/*
* From the Linux kernel arch/arm/include/asm/cp15.h
*
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ */
+
+/*
* CR1 bits (CP#15 CR1)
*/
#define CR_M (1 << 0) /* MMU enable */
diff --git a/lib/arm/asm/thread_info.h b/lib/arm/asm/thread_info.h
index 7eaac7c32953..9f0c14db7406 100644
--- a/lib/arm/asm/thread_info.h
+++ b/lib/arm/asm/thread_info.h
@@ -3,9 +3,9 @@
/*
* Adapted from arch/arm64/include/asm/thread_info.h
*
- * Copyright (C) 2015, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <asm/page.h>
diff --git a/lib/arm/bitops.c b/lib/arm/bitops.c
index 1f1db93a18a1..9ab241b9f626 100644
--- a/lib/arm/bitops.c
+++ b/lib/arm/bitops.c
@@ -1,10 +1,10 @@
/*
- * Adapated from
+ * Adapted from
* include/asm-generic/bitops/atomic.h
*
- * Copyright (C) 2015, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <bitops.h>
#include <asm/barrier.h>
diff --git a/lib/arm/eabi_compat.c b/lib/arm/eabi_compat.c
index 8133ce7995cb..9d0ca6656eda 100644
--- a/lib/arm/eabi_compat.c
+++ b/lib/arm/eabi_compat.c
@@ -1,5 +1,9 @@
/*
* Adapted from u-boot's arch/arm/lib/eabi_compat.c
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <libcflat.h>
diff --git a/lib/arm64/asm-offsets.c b/lib/arm64/asm-offsets.c
index d7d33f4d917a..53a1277118ee 100644
--- a/lib/arm64/asm-offsets.c
+++ b/lib/arm64/asm-offsets.c
@@ -1,9 +1,9 @@
/*
* Adapted from arch/arm64/kernel/asm-offsets.c
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <libcflat.h>
#include <kbuild.h>
diff --git a/lib/arm64/asm/barrier.h b/lib/arm64/asm/barrier.h
index 4f7bb97c2279..0e1904cf507e 100644
--- a/lib/arm64/asm/barrier.h
+++ b/lib/arm64/asm/barrier.h
@@ -2,6 +2,10 @@
#define _ASMARM64_BARRIER_H_
/*
* From Linux arch/arm64/include/asm/barrier.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#define sev() asm volatile("sev" : : : "memory")
diff --git a/lib/arm64/asm/bitops.h b/lib/arm64/asm/bitops.h
index 618468c43862..be04e10551d0 100644
--- a/lib/arm64/asm/bitops.h
+++ b/lib/arm64/asm/bitops.h
@@ -4,9 +4,9 @@
* Adapated from
* arch/arm64/lib/bitops.S
*
- * Copyright (C) 2015, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#ifndef _BITOPS_H_
diff --git a/lib/arm64/asm/esr.h b/lib/arm64/asm/esr.h
index 8407b003afa7..8e5af4d90767 100644
--- a/lib/arm64/asm/esr.h
+++ b/lib/arm64/asm/esr.h
@@ -1,5 +1,9 @@
/*
* From Linux kernel arch/arm64/include/asm/esr.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#ifndef _ASMARM64_ESR_H_
#define _ASMARM64_ESR_H_
diff --git a/lib/arm64/asm/io.h b/lib/arm64/asm/io.h
index 07b82cb9d869..e0a03b250d5b 100644
--- a/lib/arm64/asm/io.h
+++ b/lib/arm64/asm/io.h
@@ -3,6 +3,10 @@
/*
* From Linux arch/arm64/include/asm/io.h
* Generic IO read/write. These perform native-endian accesses.
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <libcflat.h>
#include <asm/barrier.h>
diff --git a/lib/arm64/asm/page.h b/lib/arm64/asm/page.h
index 3144e8efcc7a..35ea0ed82750 100644
--- a/lib/arm64/asm/page.h
+++ b/lib/arm64/asm/page.h
@@ -6,9 +6,9 @@
* include/asm-generic/pgtable-nopud.h
* include/asm-generic/pgtable-nopmd.h
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <linux/const.h>
diff --git a/lib/arm64/asm/pgtable-hwdef.h b/lib/arm64/asm/pgtable-hwdef.h
index 20ac9fa40298..8e9c2952574a 100644
--- a/lib/arm64/asm/pgtable-hwdef.h
+++ b/lib/arm64/asm/pgtable-hwdef.h
@@ -3,7 +3,12 @@
/*
* From arch/arm64/include/asm/pgtable-hwdef.h
* arch/arm64/include/asm/memory.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
+
#define UL(x) _AC(x, UL)
#define PTRS_PER_PTE (1 << (PAGE_SHIFT - 3))
diff --git a/lib/arm64/asm/pgtable.h b/lib/arm64/asm/pgtable.h
index 3635b075682a..217cdb687a21 100644
--- a/lib/arm64/asm/pgtable.h
+++ b/lib/arm64/asm/pgtable.h
@@ -9,6 +9,10 @@
* Note: some Linux function APIs have been modified. Nothing crazy,
* but if a function took, for example, an mm_struct, then
* that was either removed or replaced.
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <alloc.h>
#include <asm/setup.h>
diff --git a/lib/arm64/asm/ptrace.h b/lib/arm64/asm/ptrace.h
index dd89d82063b1..ccb38dc6f58f 100644
--- a/lib/arm64/asm/ptrace.h
+++ b/lib/arm64/asm/ptrace.h
@@ -4,6 +4,10 @@
* Adapted from Linux kernel headers
* arch/arm64/include/asm/ptrace.h
* arch/arm64/include/uapi/asm/ptrace.h
+ *
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
/* Current Exception Level values, as contained in CurrentEL */
diff --git a/lib/asm-generic/io.h b/lib/asm-generic/io.h
index 91a2d7995d3d..88972f3bfd50 100644
--- a/lib/asm-generic/io.h
+++ b/lib/asm-generic/io.h
@@ -5,9 +5,9 @@
* adapted from the Linux kernel's include/asm-generic/io.h
* and arch/arm/include/asm/io.h
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include "libcflat.h"
#include "asm/page.h"
diff --git a/lib/asm-generic/page.h b/lib/asm-generic/page.h
index 7b8a08bfaacc..5ed086129657 100644
--- a/lib/asm-generic/page.h
+++ b/lib/asm-generic/page.h
@@ -4,9 +4,9 @@
* asm-generic/page.h
* adapted from the Linux kernel's include/asm-generic/page.h
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include <linux/const.h>
diff --git a/lib/bitops.h b/lib/bitops.h
index 9aa847e10da9..185c5d361fea 100644
--- a/lib/bitops.h
+++ b/lib/bitops.h
@@ -2,12 +2,12 @@
#define _BITOPS_H_
/*
- * Adapated from
+ * Adapted from
* include/linux/bitops.h
*
- * Copyright (C) 2015, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#define BITS_PER_LONG_LONG 64
diff --git a/lib/virtio-mmio.c b/lib/virtio-mmio.c
index fa8dd5b8d484..e4a92f196eb8 100644
--- a/lib/virtio-mmio.c
+++ b/lib/virtio-mmio.c
@@ -1,9 +1,9 @@
/*
* virtqueue support adapted from the Linux kernel.
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include "libcflat.h"
#include "devicetree.h"
diff --git a/lib/virtio-mmio.h b/lib/virtio-mmio.h
index 8046a4747959..250f28a0d300 100644
--- a/lib/virtio-mmio.h
+++ b/lib/virtio-mmio.h
@@ -3,9 +3,9 @@
/*
* A minimal implementation of virtio-mmio. Adapted from the Linux Kernel.
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include "libcflat.h"
#include "asm/page.h"
diff --git a/lib/virtio.c b/lib/virtio.c
index 9532d1aeb170..6905475745ec 100644
--- a/lib/virtio.c
+++ b/lib/virtio.c
@@ -1,9 +1,9 @@
/*
* virtqueue support adapted from the Linux kernel.
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include "libcflat.h"
#include "asm/io.h"
diff --git a/lib/virtio.h b/lib/virtio.h
index 4801e204a469..2c31fdc7f7f3 100644
--- a/lib/virtio.h
+++ b/lib/virtio.h
@@ -4,9 +4,9 @@
* A minimal implementation of virtio.
* Structures adapted from the Linux Kernel.
*
- * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@redhat.com>
+ * Copyright (C) 2017, Red Hat Inc, Andrew Jones <drjones@redhat.com>
*
- * This work is licensed under the terms of the GNU LGPL, version 2.
+ * This work is licensed under the terms of the GNU GPL, version 2.
*/
#include "libcflat.h"
--
2.9.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-07 14:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-29 15:48 [PATCH kvm-unit-tests] arm/arm64: code derived from Linux must be GPL not LGPL Andrew Jones
2017-06-07 14:25 ` Radim Krčmář
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox