From 4f19048fd0a0036e02443237952db5bfa5b5cdf0 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 27 May 2019 08:55:14 +0200 Subject: [PATCH] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166 Based on 1 normalized pattern(s): licensed under the terms of the gnu gpl license version 2 extracted by the scancode license scanner the SPDX license identifier GPL-2.0-only has been chosen to replace the boilerplate/reference in 62 file(s). Signed-off-by: Thomas Gleixner Reviewed-by: Allison Randal Reviewed-by: Kate Stewart Reviewed-by: Richard Fontana Cc: linux-spdx@vger.kernel.org Link: https://lkml.kernel.org/r/20190527070033.929121379@linutronix.de Signed-off-by: Greg Kroah-Hartman --- drivers/cpufreq/cpufreq-nforce2.c | 2 +- drivers/cpufreq/e_powersaver.c | 3 +-- drivers/cpufreq/longhaul.c | 2 +- drivers/cpufreq/longhaul.h | 3 +-- drivers/cpufreq/longrun.c | 3 +-- drivers/cpufreq/powernow-k6.c | 3 +-- drivers/cpufreq/powernow-k7.c | 2 +- drivers/cpufreq/powernow-k7.h | 4 +--- drivers/cpufreq/powernow-k8.c | 5 +---- drivers/cpufreq/speedstep-ich.c | 2 +- drivers/cpufreq/speedstep-lib.c | 3 +-- drivers/cpufreq/speedstep-lib.h | 3 +-- drivers/cpufreq/speedstep-smi.c | 4 +--- scripts/checkkconfigsymbols.py | 2 +- scripts/gfp-translate | 2 +- scripts/leaking_addresses.pl | 2 +- scripts/recordmcount.pl | 2 +- scripts/tracing/draw_functrace.py | 2 +- tools/perf/scripts/perl/rw-by-file.pl | 2 +- tools/perf/scripts/perl/rw-by-pid.pl | 2 +- tools/perf/scripts/perl/rwtop.pl | 2 +- tools/perf/scripts/perl/wakeup-latency.pl | 2 +- tools/power/cpupower/debug/i386/centrino-decode.c | 3 +-- tools/power/cpupower/debug/i386/intel_gsic.c | 3 +-- tools/power/cpupower/debug/i386/powernow-k8-decode.c | 3 +-- tools/power/cpupower/lib/cpufreq.c | 3 +-- tools/power/cpupower/lib/cpuidle.c | 3 +-- tools/power/cpupower/lib/cpupower.c | 3 +-- tools/power/cpupower/utils/cpufreq-info.c | 3 +-- tools/power/cpupower/utils/cpufreq-set.c | 3 +-- tools/power/cpupower/utils/cpuidle-info.c | 3 +-- tools/power/cpupower/utils/cpupower-info.c | 3 +-- tools/power/cpupower/utils/cpupower-set.c | 3 +-- tools/power/cpupower/utils/cpupower.c | 3 +-- tools/power/cpupower/utils/helpers/helpers.h | 3 +-- tools/power/cpupower/utils/helpers/sysfs.c | 3 +-- tools/power/cpupower/utils/helpers/topology.c | 3 +-- tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c | 3 +-- tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c | 4 +--- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 4 +--- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 4 +--- tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 3 +-- tools/power/cpupower/utils/idle_monitor/idle_monitors.h | 4 +--- tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 3 +-- tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 3 +-- tools/power/cpupower/utils/idle_monitor/snb_idle.c | 3 +-- tools/testing/ktest/config-bisect.pl | 3 +-- tools/testing/ktest/ktest.pl | 2 +- tools/testing/selftests/breakpoints/breakpoint_test.c | 3 +-- tools/testing/selftests/exec/execveat.c | 3 +-- tools/testing/selftests/size/get_size.c | 3 +-- tools/testing/selftests/timers/posix_timers.c | 3 +-- 52 files changed, 52 insertions(+), 98 deletions(-) diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c index 33c309a08c64..cd53272e2fa2 100644 --- a/drivers/cpufreq/cpufreq-nforce2.c +++ b/drivers/cpufreq/cpufreq-nforce2.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2006 Sebastian Witt * - * Licensed under the terms of the GNU GPL License version 2. * Based upon reverse engineered information * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c index 2d3ef208dd70..45c18c6b8081 100644 --- a/drivers/cpufreq/e_powersaver.c +++ b/drivers/cpufreq/e_powersaver.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Based on documentation provided by Dave Jones. Thanks! * - * Licensed under the terms of the GNU GPL License version 2. - * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* */ diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c index fb546e0d0356..92d92e67ae0a 100644 --- a/drivers/cpufreq/longhaul.c +++ b/drivers/cpufreq/longhaul.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2001-2004 Dave Jones. * (C) 2002 Padraig Brady. * - * Licensed under the terms of the GNU GPL License version 2. * Based upon datasheets & sample CPUs kindly provided by VIA. * * VIA have currently 3 different versions of Longhaul. diff --git a/drivers/cpufreq/longhaul.h b/drivers/cpufreq/longhaul.h index 1928b923a57b..89c4cc297cb6 100644 --- a/drivers/cpufreq/longhaul.h +++ b/drivers/cpufreq/longhaul.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * longhaul.h * (C) 2003 Dave Jones. * - * Licensed under the terms of the GNU GPL License version 2. - * * VIA-specific information */ diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c index 542aa9adba1a..64b8689f7a4a 100644 --- a/drivers/cpufreq/longrun.c +++ b/drivers/cpufreq/longrun.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2002 - 2003 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. - * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* */ diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c index 8a8ea68611a8..0196f8129597 100644 --- a/drivers/cpufreq/powernow-k6.c +++ b/drivers/cpufreq/powernow-k6.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * This file was based upon code in Powertweak Linux (http://powertweak.sf.net) * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, * Dominik Brodowski. * - * Licensed under the terms of the GNU GPL License version 2. - * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* */ diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c index d6cb052b0a75..5e5171d3eece 100644 --- a/drivers/cpufreq/powernow-k7.c +++ b/drivers/cpufreq/powernow-k7.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * AMD K7 Powernow driver. * (C) 2003 Dave Jones on behalf of SuSE Labs. * - * Licensed under the terms of the GNU GPL License version 2. * Based upon datasheets & sample CPUs kindly provided by AMD. * * Errata 5: diff --git a/drivers/cpufreq/powernow-k7.h b/drivers/cpufreq/powernow-k7.h index 35fb4eaf6e1c..4bc673faeef7 100644 --- a/drivers/cpufreq/powernow-k7.h +++ b/drivers/cpufreq/powernow-k7.h @@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * (C) 2003 Dave Jones. * - * Licensed under the terms of the GNU GPL License version 2. - * * AMD-specific information - * */ union msr_fidvidctl { diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index 3c12e03fa343..2db2f1739e09 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c @@ -1,8 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (c) 2003-2012 Advanced Micro Devices, Inc. - * Your use of this code is subject to the terms and conditions of the - * GNU general public license version 2. See "COPYING" or - * http://www.gnu.org/licenses/gpl.html * * Maintainer: * Andreas Herrmann @@ -11,7 +9,6 @@ * (C) 2003 Dave Jones on behalf of SuSE Labs * (C) 2004 Dominik Brodowski * (C) 2004 Pavel Machek - * Licensed under the terms of the GNU GPL License version 2. * Based upon datasheets & sample CPUs kindly provided by AMD. * * Valuable input gratefully received from Dave Jones, Pavel Machek, diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c index 5d8a09b82efb..547fd7af5bf5 100644 --- a/drivers/cpufreq/speedstep-ich.c +++ b/drivers/cpufreq/speedstep-ich.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2001 Dave Jones, Arjan van de ven. * (C) 2002 - 2003 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. * Based upon reverse engineered information, and on Intel documentation * for chipsets ICH2-M and ICH3-M. * diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c index cabb6f48eb77..5c4f8f07c5a6 100644 --- a/drivers/cpufreq/speedstep-lib.c +++ b/drivers/cpufreq/speedstep-lib.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2002 - 2003 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. - * * Library for common functions for Intel SpeedStep v.1 and v.2 support * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* diff --git a/drivers/cpufreq/speedstep-lib.h b/drivers/cpufreq/speedstep-lib.h index 70d9cea1219d..dc762ea786be 100644 --- a/drivers/cpufreq/speedstep-lib.h +++ b/drivers/cpufreq/speedstep-lib.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * (C) 2002 - 2003 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. - * * Library for common functions for Intel SpeedStep v.1 and v.2 support * * BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous* diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c index 01fe70dae20b..eeb31bc21cc9 100644 --- a/drivers/cpufreq/speedstep-smi.c +++ b/drivers/cpufreq/speedstep-smi.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Intel SpeedStep SMI driver. * * (C) 2003 Hiroshi Miura - * - * Licensed under the terms of the GNU GPL License version 2. - * */ diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py index 8cd16c65d3c5..00a10a293f4f 100755 --- a/scripts/checkkconfigsymbols.py +++ b/scripts/checkkconfigsymbols.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-only """Find Kconfig symbols that are referenced but not defined.""" # (c) 2014-2017 Valentin Rothberg # (c) 2014 Stefan Hengelein # -# Licensed under the terms of the GNU GPL License version 2 import argparse diff --git a/scripts/gfp-translate b/scripts/gfp-translate index c9230e158a8f..b2ce416d944b 100755 --- a/scripts/gfp-translate +++ b/scripts/gfp-translate @@ -1,7 +1,7 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0-only # Translate the bits making up a GFP mask # (c) 2009, Mel Gorman -# Licensed under the terms of the GNU GPL License version 2 SOURCE= GFPMASK=none diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index ef9e5b2a1614..b2d8b8aa2d99 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0-only # # (c) 2017 Tobin C. Harding -# Licensed under the terms of the GNU GPL License version 2 # # leaking_addresses.pl: Scan the kernel for potential leaking addresses. # - Scans dmesg output. diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index d24759214efd..3f77a5d695c1 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0-only # (c) 2008, Steven Rostedt -# Licensed under the terms of the GNU GPL License version 2 # # recordmcount.pl - makes a section called __mcount_loc that holds # all the offsets to the calls to mcount. diff --git a/scripts/tracing/draw_functrace.py b/scripts/tracing/draw_functrace.py index 9b6dd4f36335..b65735758520 100755 --- a/scripts/tracing/draw_functrace.py +++ b/scripts/tracing/draw_functrace.py @@ -1,8 +1,8 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0-only """ Copyright 2008 (c) Frederic Weisbecker -Licensed under the terms of the GNU GPL License version 2 This script parses a trace provided by the function tracer in kernel/trace/trace_functions.c diff --git a/tools/perf/scripts/perl/rw-by-file.pl b/tools/perf/scripts/perl/rw-by-file.pl index 74844ee2be3e..168fa5e94b44 100644 --- a/tools/perf/scripts/perl/rw-by-file.pl +++ b/tools/perf/scripts/perl/rw-by-file.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # (c) 2009, Tom Zanussi -# Licensed under the terms of the GNU GPL License version 2 # Display r/w activity for files read/written to for a given program diff --git a/tools/perf/scripts/perl/rw-by-pid.pl b/tools/perf/scripts/perl/rw-by-pid.pl index 9db23c9daf55..495698250b2f 100644 --- a/tools/perf/scripts/perl/rw-by-pid.pl +++ b/tools/perf/scripts/perl/rw-by-pid.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # (c) 2009, Tom Zanussi -# Licensed under the terms of the GNU GPL License version 2 # Display r/w activity for all processes diff --git a/tools/perf/scripts/perl/rwtop.pl b/tools/perf/scripts/perl/rwtop.pl index 8b20787021c1..6473442568a2 100644 --- a/tools/perf/scripts/perl/rwtop.pl +++ b/tools/perf/scripts/perl/rwtop.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # (c) 2010, Tom Zanussi -# Licensed under the terms of the GNU GPL License version 2 # read/write top # diff --git a/tools/perf/scripts/perl/wakeup-latency.pl b/tools/perf/scripts/perl/wakeup-latency.pl index d9143dcec6c6..efcfec5e347a 100644 --- a/tools/perf/scripts/perl/wakeup-latency.pl +++ b/tools/perf/scripts/perl/wakeup-latency.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # (c) 2009, Tom Zanussi -# Licensed under the terms of the GNU GPL License version 2 # Display avg/min/max wakeup latency diff --git a/tools/power/cpupower/debug/i386/centrino-decode.c b/tools/power/cpupower/debug/i386/centrino-decode.c index 7ef24cce4926..700cd31a7d02 100644 --- a/tools/power/cpupower/debug/i386/centrino-decode.c +++ b/tools/power/cpupower/debug/i386/centrino-decode.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2003 - 2004 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on code found in * linux/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c * and originally developed by Jeremy Fitzhardinge. diff --git a/tools/power/cpupower/debug/i386/intel_gsic.c b/tools/power/cpupower/debug/i386/intel_gsic.c index d032c826d42e..e5e926f46d6b 100644 --- a/tools/power/cpupower/debug/i386/intel_gsic.c +++ b/tools/power/cpupower/debug/i386/intel_gsic.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2003 Bruno Ducrot * (C) 2004 Dominik Brodowski * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on code found in * linux/include/asm-i386/ist.h and linux/arch/i386/kernel/setup.c * and originally developed by Andy Grover diff --git a/tools/power/cpupower/debug/i386/powernow-k8-decode.c b/tools/power/cpupower/debug/i386/powernow-k8-decode.c index 638a6b3bfd97..735dca1e25bc 100644 --- a/tools/power/cpupower/debug/i386/powernow-k8-decode.c +++ b/tools/power/cpupower/debug/i386/powernow-k8-decode.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004 Bruno Ducrot * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on code found in * linux/arch/i386/kernel/cpu/cpufreq/powernow-k8.c * and originally developed by Paul Devriendt diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c index 80650497fb80..2f55d4d23446 100644 --- a/tools/power/cpupower/lib/cpufreq.c +++ b/tools/power/cpupower/lib/cpufreq.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/lib/cpuidle.c b/tools/power/cpupower/lib/cpuidle.c index 852d25462388..479c5971aa6d 100644 --- a/tools/power/cpupower/lib/cpuidle.c +++ b/tools/power/cpupower/lib/cpuidle.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski * (C) 2011 Thomas Renninger Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. */ #include diff --git a/tools/power/cpupower/lib/cpupower.c b/tools/power/cpupower/lib/cpupower.c index 9711d628b0f4..3656e697537e 100644 --- a/tools/power/cpupower/lib/cpupower.c +++ b/tools/power/cpupower/lib/cpupower.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski - * - * Licensed under the terms of the GNU GPL License version 2. */ #include diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c index 10290b308797..e63cf55f81cf 100644 --- a/tools/power/cpupower/utils/cpufreq-info.c +++ b/tools/power/cpupower/utils/cpufreq-info.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c index 1eef0aed6423..f49bc4aa2a08 100644 --- a/tools/power/cpupower/utils/cpufreq-set.c +++ b/tools/power/cpupower/utils/cpufreq-set.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/utils/cpuidle-info.c b/tools/power/cpupower/utils/cpuidle-info.c index b59c85defa05..f2b202c5552a 100644 --- a/tools/power/cpupower/utils/cpuidle-info.c +++ b/tools/power/cpupower/utils/cpuidle-info.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski * (C) 2010 Thomas Renninger - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/utils/cpupower-info.c b/tools/power/cpupower/utils/cpupower-info.c index c7caa8eaa6d0..4c9d342b70ff 100644 --- a/tools/power/cpupower/utils/cpupower-info.c +++ b/tools/power/cpupower/utils/cpupower-info.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2011 Thomas Renninger , Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c index 532f46b9a335..3cd95c6cb974 100644 --- a/tools/power/cpupower/utils/cpupower-set.c +++ b/tools/power/cpupower/utils/cpupower-set.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2011 Thomas Renninger , Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. */ diff --git a/tools/power/cpupower/utils/cpupower.c b/tools/power/cpupower/utils/cpupower.c index 2dccf4998599..8e3d08042825 100644 --- a/tools/power/cpupower/utils/cpupower.c +++ b/tools/power/cpupower/utils/cpupower.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Ideas taken over from the perf userspace tool (included in the Linus * kernel git repo): subcommand builtins and param parsing. */ diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h index 902139689315..357b19bb136e 100644 --- a/tools/power/cpupower/utils/helpers/helpers.h +++ b/tools/power/cpupower/utils/helpers/helpers.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Miscellaneous helpers which do not fit or are worth * to put into separate headers */ diff --git a/tools/power/cpupower/utils/helpers/sysfs.c b/tools/power/cpupower/utils/helpers/sysfs.c index 4e8fe2c7b054..e13ff38329a0 100644 --- a/tools/power/cpupower/utils/helpers/sysfs.c +++ b/tools/power/cpupower/utils/helpers/sysfs.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2004-2009 Dominik Brodowski * (C) 2011 Thomas Renninger Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. */ #include diff --git a/tools/power/cpupower/utils/helpers/topology.c b/tools/power/cpupower/utils/helpers/topology.c index a1a6c6041a1e..3dd0925d7594 100644 --- a/tools/power/cpupower/utils/helpers/topology.c +++ b/tools/power/cpupower/utils/helpers/topology.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * ToDo: Needs to be done more properly for AMD/Intel specifics */ diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c index 2116df9ad832..3f893b99b337 100644 --- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c +++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * PCI initialization based on example code from: * Andreas Herrmann */ diff --git a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c index 5b8c4956ff9a..f634aeb65c5f 100644 --- a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c +++ b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c @@ -1,8 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc - * - * Licensed under the terms of the GNU GPL License version 2. - * */ #include diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c index 051da0a7c454..d3c3e6e7aa26 100644 --- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c +++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Output format inspired by Len Brown's turbostat tool. - * */ diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h index 2ae50b499e0a..a2d901d3bfaf 100644 --- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h +++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * (C) 2010,2011 Thomas Renninger , Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. - * */ #ifndef __CPUIDLE_INFO_HW__ diff --git a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c index f794d6bbb7e9..7c7451d3f494 100644 --- a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c +++ b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on SandyBridge monitor. Implements the new package C-states * (PC8, PC9, PC10) coming with a specific Haswell (family 0x45) CPU. */ diff --git a/tools/power/cpupower/utils/idle_monitor/idle_monitors.h b/tools/power/cpupower/utils/idle_monitor/idle_monitors.h index 4fcdeb1e07e8..e9e567ec879e 100644 --- a/tools/power/cpupower/utils/idle_monitor/idle_monitors.h +++ b/tools/power/cpupower/utils/idle_monitor/idle_monitors.h @@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on the idea from Michael Matz - * */ #ifndef _CPUIDLE_IDLE_MONITORS_H_ diff --git a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c index f2a7e9cfd577..44806a6dae11 100644 --- a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +++ b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. - * - * Licensed under the terms of the GNU GPL License version 2. */ #if defined(__i386__) || defined(__x86_64__) diff --git a/tools/power/cpupower/utils/idle_monitor/nhm_idle.c b/tools/power/cpupower/utils/idle_monitor/nhm_idle.c index abf8cb5f7349..be7256696a37 100644 --- a/tools/power/cpupower/utils/idle_monitor/nhm_idle.c +++ b/tools/power/cpupower/utils/idle_monitor/nhm_idle.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on Len Brown's turbostat tool. */ diff --git a/tools/power/cpupower/utils/idle_monitor/snb_idle.c b/tools/power/cpupower/utils/idle_monitor/snb_idle.c index a2b45219648d..968333571cad 100644 --- a/tools/power/cpupower/utils/idle_monitor/snb_idle.c +++ b/tools/power/cpupower/utils/idle_monitor/snb_idle.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * (C) 2010,2011 Thomas Renninger , Novell Inc. * - * Licensed under the terms of the GNU GPL License version 2. - * * Based on Len Brown's turbostat tool. */ diff --git a/tools/testing/ktest/config-bisect.pl b/tools/testing/ktest/config-bisect.pl index b28feea7c363..72525426654b 100755 --- a/tools/testing/ktest/config-bisect.pl +++ b/tools/testing/ktest/config-bisect.pl @@ -1,10 +1,9 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # # Copyright 2015 - Steven Rostedt, Red Hat Inc. # Copyright 2017 - Steven Rostedt, VMware, Inc. # -# Licensed under the terms of the GNU GPL License version 2 -# # usage: # config-bisect.pl [options] good-config bad-config [good|bad] diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 4711f57e809a..220d04f958a6 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w +# SPDX-License-Identifier: GPL-2.0-only # # Copyright 2010 - Steven Rostedt , Red Hat Inc. -# Licensed under the terms of the GNU GPL License version 2 # use strict; diff --git a/tools/testing/selftests/breakpoints/breakpoint_test.c b/tools/testing/selftests/breakpoints/breakpoint_test.c index 8f3655e59020..3266cc9293fe 100644 --- a/tools/testing/selftests/breakpoints/breakpoint_test.c +++ b/tools/testing/selftests/breakpoints/breakpoint_test.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2011 Red Hat, Inc., Frederic Weisbecker * - * Licensed under the terms of the GNU GPL License version 2 - * * Selftests for breakpoints (and more generally the do_debug() path) in x86. */ diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index 47cbf54d0801..cbb6efbdb786 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2014 Google, Inc. * - * Licensed under the terms of the GNU GPL License version 2 - * * Selftests for execveat(2). */ diff --git a/tools/testing/selftests/size/get_size.c b/tools/testing/selftests/size/get_size.c index d4b59ab979a0..2ad45b944355 100644 --- a/tools/testing/selftests/size/get_size.c +++ b/tools/testing/selftests/size/get_size.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2014 Sony Mobile Communications Inc. * - * Licensed under the terms of the GNU GPL License version 2 - * * Selftest for runtime system size * * Prints the amount of RAM that the currently running system is using. diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c index 15cf56d32155..0ba500056e63 100644 --- a/tools/testing/selftests/timers/posix_timers.c +++ b/tools/testing/selftests/timers/posix_timers.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2013 Red Hat, Inc., Frederic Weisbecker * - * Licensed under the terms of the GNU GPL License version 2 - * * Selftests for a few posix timers interface. * * Kernel loop code stolen from Steven Rostedt -- 2.30.2