In the past we had some issues when developers wanted to use code snippets or constants from the kernel in a test or in the library. To remedy that the s390x maintainers decided to move all files to GPL 2 (if possible). At the same time let's move to SPDX identifiers as they are much nicer to read. Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx> Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx> Reviewed-by: Cornelia Huck <cohuck@xxxxxxxxxx> Acked-by: David Hildenbrand <david@xxxxxxxxxx> Acked-by: Pierre Morel <pmorel@xxxxxxxxxxxxx> --- s390x/cmm.c | 4 +--- s390x/cpumodel.c | 4 +--- s390x/css.c | 4 +--- s390x/cstart64.S | 4 +--- s390x/diag10.c | 4 +--- s390x/diag288.c | 4 +--- s390x/diag308.c | 5 +---- s390x/emulator.c | 4 +--- s390x/gs.c | 4 +--- s390x/iep.c | 4 +--- s390x/intercept.c | 4 +--- s390x/pfmf.c | 4 +--- s390x/sclp.c | 4 +--- s390x/selftest.c | 4 +--- s390x/skey.c | 4 +--- s390x/skrf.c | 4 +--- s390x/smp.c | 4 +--- s390x/sthyi.c | 4 +--- s390x/sthyi.h | 4 +--- s390x/stsi.c | 4 +--- s390x/uv-guest.c | 4 +--- s390x/vector.c | 4 +--- 22 files changed, 22 insertions(+), 67 deletions(-) diff --git a/s390x/cmm.c b/s390x/cmm.c index fe4d9df..c3f0c93 100644 --- a/s390x/cmm.c +++ b/s390x/cmm.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * CMM tests (ESSA) * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c index 116a966..4dd8b96 100644 --- a/s390x/cpumodel.c +++ b/s390x/cpumodel.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Test the known dependencies for facilities * @@ -5,9 +6,6 @@ * * Authors: * Christian Borntraeger <borntraeger@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <asm/facility.h> diff --git a/s390x/css.c b/s390x/css.c index ee3bc83..23a7b7c 100644 --- a/s390x/css.c +++ b/s390x/css.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Channel Subsystem tests * @@ -5,9 +6,6 @@ * * Authors: * Pierre Morel <pmorel@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/cstart64.S b/s390x/cstart64.S index 4e51150..cc86fc7 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x startup code * @@ -6,9 +7,6 @@ * Authors: * Thomas Huth <thuth@xxxxxxxxxx> * David Hildenbrand <david@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <asm/asm-offsets.h> #include <asm/sigp.h> diff --git a/s390x/diag10.c b/s390x/diag10.c index 7ee8945..579a7a5 100644 --- a/s390x/diag10.c +++ b/s390x/diag10.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Release pages hypercall tests (DIAG 10) * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/diag288.c b/s390x/diag288.c index e2ecdc8..e132ff0 100644 --- a/s390x/diag288.c +++ b/s390x/diag288.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Timer Event DIAG288 test * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/diag308.c b/s390x/diag308.c index 7fc4abd..c9d6c49 100644 --- a/s390x/diag308.c +++ b/s390x/diag308.c @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Diagnose 0x308 hypercall tests * * Copyright (c) 2019 Thomas Huth, Red Hat Inc. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2, or (at - * your option) any later version. */ #include <libcflat.h> diff --git a/s390x/emulator.c b/s390x/emulator.c index 70ef51a..b2787a5 100644 --- a/s390x/emulator.c +++ b/s390x/emulator.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Emulator tests - for s390x CPU instructions that are usually interpreted * by the hardware @@ -6,9 +7,6 @@ * * Authors: * David Hildenbrand <david@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/cpacf.h> diff --git a/s390x/gs.c b/s390x/gs.c index f685aa9..1376d0e 100644 --- a/s390x/gs.c +++ b/s390x/gs.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests guarded storage support. * @@ -6,9 +7,6 @@ * Authors: * Martin Schwidefsky <schwidefsky@xxxxxxxxxx> * Janosch Frank <frankja@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/page.h> diff --git a/s390x/iep.c b/s390x/iep.c index 55c01ee..fe167ef 100644 --- a/s390x/iep.c +++ b/s390x/iep.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Instruction Execution Prevention (IEP) DAT test. * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <vmalloc.h> diff --git a/s390x/intercept.c b/s390x/intercept.c index 2e38257..cde2f5f 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Interception tests - for s390x CPU instruction that cause a VM exit * @@ -5,9 +6,6 @@ * * Authors: * Thomas Huth <thuth@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/pfmf.c b/s390x/pfmf.c index ac57fe4..2f3cb11 100644 --- a/s390x/pfmf.c +++ b/s390x/pfmf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Perform Frame Management Function (pfmf) tests * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/sclp.c b/s390x/sclp.c index 7d92bf3..73d722f 100644 --- a/s390x/sclp.c +++ b/s390x/sclp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Service Call tests * @@ -5,9 +6,6 @@ * * Authors: * Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/selftest.c b/s390x/selftest.c index eaf5b18..b2fe2e7 100644 --- a/s390x/selftest.c +++ b/s390x/selftest.c @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <thuth@xxxxxxxxxx> * David Hildenbrand <david@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <util.h> diff --git a/s390x/skey.c b/s390x/skey.c index 86d15e2..2539944 100644 --- a/s390x/skey.c +++ b/s390x/skey.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Storage key tests * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/skrf.c b/s390x/skrf.c index b19d0f4..57524ba 100644 --- a/s390x/skrf.c +++ b/s390x/skrf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Storage key removal facility tests * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/smp.c b/s390x/smp.c index 4ca1dce..b0ece49 100644 --- a/s390x/smp.c +++ b/s390x/smp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests sigp emulation * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/sthyi.c b/s390x/sthyi.c index 68c57cb..d8dfc85 100644 --- a/s390x/sthyi.c +++ b/s390x/sthyi.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests exceptions and data validity for the emulated sthyi * instruction. @@ -6,9 +7,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/asm-offsets.h> diff --git a/s390x/sthyi.h b/s390x/sthyi.h index 06f757f..bbd74c6 100644 --- a/s390x/sthyi.h +++ b/s390x/sthyi.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * STHYI related flags and structure definitions. * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #ifndef _STHYI_H_ #define _STHYI_H_ diff --git a/s390x/stsi.c b/s390x/stsi.c index b81cea7..4109b8d 100644 --- a/s390x/stsi.c +++ b/s390x/stsi.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Store System Information tests * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c index d47333e..bc947ab 100644 --- a/s390x/uv-guest.c +++ b/s390x/uv-guest.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Guest Ultravisor Call tests * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2. */ #include <libcflat.h> diff --git a/s390x/vector.c b/s390x/vector.c index 0159ba1..d1b6a57 100644 --- a/s390x/vector.c +++ b/s390x/vector.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests vector instruction support * @@ -5,9 +6,6 @@ * * Authors: * Janosch Frank <frankja@xxxxxxxxxx> - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License version 2. */ #include <libcflat.h> #include <asm/page.h> -- 2.25.1
