time: Cleanup license information

PATCH In review Thomas Gleixner 2 participants 7 messages Mar 19, 2018

Subsystems (4)

Timekeeping, clocksource core, NTP, alarmtimer High-resolution timers, timer wheel, clockevents Nohz, dynticks support Posix clocks and timers

lore

Share & tools

lore

Thomas Gleixner

author

2018-03-19 10:04 UTC #0 lore raw

cover time: Cleanup license information

The following patch series cleans up the licensing information in the time subsystem.

* Replace boiler plate language and sloppy references with SPDX

* Add missing SPDX identifiers to files with no license reference

While at it clean up the top of file comments by removing pointless references to the filename itself and condense the information where appropriate.

Thanks,

tglx

---
 include/linux/hrtimer.h         |    5 +----
 kernel/time/alarmtimer.c        |    5 +----
 kernel/time/clockevents.c       |    6 +-----
 kernel/time/clocksource.c       |   20 +-------------------
 kernel/time/hrtimer.c           |   17 ++++-------------
 kernel/time/jiffies.c           |   28 ++++++----------------------
 kernel/time/posix-clock.c       |   17 ++---------------
 kernel/time/posix-stubs.c       |    5 +----
 kernel/time/posix-timers.c      |   25 ++-----------------------
 kernel/time/sched_clock.c       |    9 +++------
 kernel/time/test_udelay.c       |   10 +---------
 kernel/time/tick-broadcast.c    |    6 +-----
 kernel/time/tick-common.c       |    6 +-----
 kernel/time/tick-oneshot.c      |    6 +-----
 kernel/time/tick-sched.c        |    5 +----
 kernel/time/time.c              |   13 +++++--------
 kernel/time/timeconst.bc        |    2 ++
 kernel/time/timeconv.c          |   18 +-----------------
 kernel/time/timecounter.c       |   16 ++--------------
 kernel/time/timekeeping.c       |    8 +++-----
 kernel/time/timekeeping_debug.c |   11 +----------
 kernel/time/timer.c             |    3 +--
 kernel/time/timer_list.c        |    7 +------
 23 files changed, 43 insertions(+), 205 deletions(-)

Thomas Gleixner

author

2018-03-19 10:04 UTC #1 lore raw

PATCH 1/3 time: Remove useless filenames in top level comments

Remove the pointless filenames in the top level comments. They have no value at all and just occupy space. While at it tidy up some of the comments.

Signed-off-by Thomas Gleixner <[email protected]>

---
 include/linux/hrtimer.h      |    2 --
 kernel/time/clockevents.c    |    2 --
 kernel/time/clocksource.c    |    5 -----
 kernel/time/hrtimer.c        |   14 +++-----------
 kernel/time/jiffies.c        |    2 --
 kernel/time/posix-clock.c    |    2 +-
 kernel/time/posix-timers.c   |    4 ----
 kernel/time/sched_clock.c    |    4 ++--
 kernel/time/tick-broadcast.c |    2 --
 kernel/time/tick-common.c    |    2 --
 kernel/time/tick-oneshot.c   |    2 --
 kernel/time/tick-sched.c     |    2 --
 kernel/time/time.c           |   12 ++++--------
 kernel/time/timecounter.c    |    5 +----
 kernel/time/timekeeping.c    |    7 ++-----
 kernel/time/timer.c          |    2 --
 kernel/time/timer_list.c     |    2 --
 17 files changed, 13 insertions(+), 58 deletions(-)

include/linux/hrtimer.h +0 -2

@@ -1,6 +1,4 @@
 /*
- *  include/linux/hrtimer.h
- *
  *  hrtimers - High-resolution kernel timers
  *
  *   Copyright(C) 2005, Thomas Gleixner <[email protected]>

kernel/time/clockevents.c +0 -2

@@ -1,6 +1,4 @@
 /*
- * linux/kernel/time/clockevents.c
- *
  * This file contains functions which manage clock event devices.
  *
  * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>

kernel/time/clocksource.c +0 -5

@@ -1,6 +1,4 @@
 /*
- * linux/kernel/time/clocksource.c
- *
  * This file contains the functions which manage clocksource drivers.
  *
  * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])

@@ -18,9 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * TODO WishList:
- *   o Allow clocksource drivers to be unregistered
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

kernel/time/hrtimer.c +3 ~~-11~~

@@ -1,21 +1,13 @@
 /*
- *  linux/kernel/hrtimer.c
- *
  *  Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  *  Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  *  Copyright(C) 2006-2007  Timesys Corp., Thomas Gleixner
  *
  *  High-resolution kernel timers
  *
- *  In contrast to the low-resolution timeout API implemented in
- *  kernel/timer.c, hrtimers provide finer resolution and accuracy
- *  depending on system configuration and capabilities.
- *
- *  These timers are currently used for:
- *   - itimers
- *   - POSIX timers
- *   - nanosleep
- *   - precise in-kernel timing
+ *  In contrast to the low-resolution timeout API, aka timer wheel,
+ *  hrtimers provide finer resolution and accuracy depending on system
+ *  configuration and capabilities.
  *
  *  Started by: Thomas Gleixner and Ingo Molnar
  *

kernel/time/jiffies.c +0 -2

@@ -1,6 +1,4 @@
 /***********************************************************************
-* linux/kernel/time/jiffies.c
-*
 * This file contains the jiffies based clocksource.
 *
 * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])

kernel/time/posix-clock.c +1 -1

@@ -1,5 +1,5 @@
 /*
- * posix-clock.c - support for dynamic clock devices
+ * Support for dynamic clock devices
  *
  * Copyright (C) 2010 OMICRON electronics GmbH
  *

kernel/time/posix-timers.c +0 -4

@@ -1,10 +1,6 @@
 /*
- * linux/kernel/posix-timers.c
- *
- *
  * 2002-10-15  Posix Clocks & timers
  *                           by George Anzinger [email protected]
- *
  *			     Copyright (C) 2002 2003 by MontaVista Software.
  *
  * 2004-06-01  Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug.

kernel/time/sched_clock.c +2 -2

@@ -1,6 +1,6 @@
 /*
- * sched_clock.c: Generic sched_clock() support, to extend low level
- *                hardware time counters to full 64-bit ns values.
+ * Generic sched_clock() support, to extend low level hardware time
+ * counters to full 64-bit ns values.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as

kernel/time/tick-broadcast.c +0 -2

@@ -1,6 +1,4 @@
 /*
- * linux/kernel/time/tick-broadcast.c
- *
  * This file contains functions which emulate a local clock-event
  * device via a broadcast event source.
  *

kernel/time/tick-common.c +0 -2

@@ -1,6 +1,4 @@
 /*
- * linux/kernel/time/tick-common.c
- *
  * This file contains the base functions to manage periodic tick
  * related events.
  *

kernel/time/tick-oneshot.c +0 -2

@@ -1,6 +1,4 @@
 /*
- * linux/kernel/time/tick-oneshot.c
- *
  * This file contains functions which manage high resolution tick
  * related events.
  *

kernel/time/tick-sched.c +0 -2

@@ -1,6 +1,4 @@
 /*
- *  linux/kernel/time/tick-sched.c
- *
  *  Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  *  Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  *  Copyright(C) 2006-2007  Timesys Corp., Thomas Gleixner

kernel/time/time.c +4 -8

@@ -1,14 +1,10 @@
 /*
- *  linux/kernel/time.c
- *
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
- *  This file contains the interface functions for the various
- *  time related system calls: time, stime, gettimeofday, settimeofday,
- *			       adjtime
- */
-/*
- * Modification history kernel/time.c
+ *  This file contains the interface functions for the various time related
+ *  system calls: time, stime, gettimeofday, settimeofday, adjtime
+ *
+ * Modification history:
  *
  * 1993-09-02    Philip Gladstone
  *      Created file with time related functions from sched/core.c and adjtimex()

kernel/time/timecounter.c +1 -4

@@ -1,8 +1,5 @@
 /*
- * linux/kernel/time/timecounter.c
- *
- * based on code that migrated away from
- * linux/kernel/time/clocksource.c
+ * based on code that migrated away from linux/kernel/time/clocksource.c
  *
  * 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

kernel/time/timekeeping.c +2 -5

@@ -1,11 +1,8 @@
 /*
- *  linux/kernel/time/timekeeping.c
- *
  *  Kernel timekeeping code and accessor functions
  *
- *  This code was moved from linux/kernel/timer.c.
- *  Please see that file for copyright and history logs.
- *
+ *  This code was moved from linux/kernel/timer.c. Please see that file for
+ *  copyright and history logs.
  */
 
 #include <linux/timekeeper_internal.h>

kernel/time/timer.c +0 -2

@@ -1,6 +1,4 @@
 /*
- *  linux/kernel/timer.c
- *
  *  Kernel internal timers
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds

kernel/time/timer_list.c +0 -2

@@ -1,6 +1,4 @@
 /*
- * kernel/time/timer_list.c
- *
  * List pending timers
  *
  * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar

Greg Kroah-Hartman

2018-03-19 10:37 UTC #2 lore raw

Re: [patch 01/3] time: Remove useless filenames in top level comments

Quoted 5 lines · Thomas Gleixner

Remove the pointless filenames in the top level comments. They have no value at all and just occupy space. While at it tidy up some of the comments.
Signed-off-by Thomas Gleixner <[email protected]>

Reviewed-off-by Greg Kroah-Hartman <[email protected]>

Thomas Gleixner

author

2018-03-19 10:04 UTC #3 lore raw

PATCH 2/3 time: Add SPDX license identifiers

In reply to Thomas Gleixner

Update the time(r) core files files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.

This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.

The following files do not contain any direct license information and have been omitted from the big initial SPDX changes:

timeconst.bc: The .bc files were not touched
time.c, timer.c, timekeeping.c: Licence was deduced from EXPORT_SYMBOL_GPL

As those files do not contain direct license references they fall under the project license, i.e. GPL V2 only.

Signed-off-by Thomas Gleixner <[email protected]>

---
 include/linux/hrtimer.h         |    1 +
 kernel/time/alarmtimer.c        |    1 +
 kernel/time/clockevents.c       |    1 +
 kernel/time/clocksource.c       |    1 +
 kernel/time/hrtimer.c           |    1 +
 kernel/time/jiffies.c           |    1 +
 kernel/time/posix-clock.c       |    1 +
 kernel/time/posix-stubs.c       |    1 +
 kernel/time/posix-timers.c      |    1 +
 kernel/time/sched_clock.c       |    1 +
 kernel/time/test_udelay.c       |    1 +
 kernel/time/tick-broadcast.c    |    1 +
 kernel/time/tick-common.c       |    1 +
 kernel/time/tick-oneshot.c      |    1 +
 kernel/time/tick-sched.c        |    1 +
 kernel/time/time.c              |    1 +
 kernel/time/timeconst.bc        |    2 ++
 kernel/time/timeconv.c          |    1 +
 kernel/time/timecounter.c       |    1 +
 kernel/time/timekeeping.c       |    1 +
 kernel/time/timekeeping_debug.c |    1 +
 kernel/time/timer.c             |    1 +
 kernel/time/timer_list.c        |    1 +
 23 files changed, 24 insertions(+)

include/linux/hrtimer.h +1 -0

@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL2.0 */
 /*
  *  hrtimers - High-resolution kernel timers
  *

kernel/time/alarmtimer.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * Alarmtimer interface
  *

kernel/time/clockevents.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * This file contains functions which manage clock event devices.
  *

kernel/time/clocksource.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /*
  * This file contains the functions which manage clocksource drivers.
  *

kernel/time/hrtimer.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  *  Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  *  Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar

kernel/time/jiffies.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /***********************************************************************
 * This file contains the jiffies based clocksource.
 *

kernel/time/posix-clock.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /*
  * Support for dynamic clock devices
  *

kernel/time/posix-stubs.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * Dummy stubs used when CONFIG_POSIX_TIMERS=n
  *

kernel/time/posix-timers.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /*
  * 2002-10-15  Posix Clocks & timers
  *                           by George Anzinger [email protected]

kernel/time/sched_clock.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * Generic sched_clock() support, to extend low level hardware time
  * counters to full 64-bit ns values.

kernel/time/test_udelay.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * udelay() test kernel module
  *

kernel/time/tick-broadcast.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * This file contains functions which emulate a local clock-event
  * device via a broadcast event source.

kernel/time/tick-common.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * This file contains the base functions to manage periodic tick
  * related events.

kernel/time/tick-oneshot.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * This file contains functions which manage high resolution tick
  * related events.

kernel/time/tick-sched.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  *  Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  *  Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar

kernel/time/time.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *

kernel/time/timeconst.bc +2 -0

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL2.0 */
+
 scale=0
 
 define gcd(a,b) {

kernel/time/timeconv.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL2.0+
 /*
  * Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
  * This file is part of the GNU C Library.

kernel/time/timecounter.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /*
  * based on code that migrated away from linux/kernel/time/clocksource.c
  *

kernel/time/timekeeping.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  *  Kernel timekeeping code and accessor functions
  *

kernel/time/timekeeping_debug.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0+
 /*
  * debugfs file to track time spent in suspend
  *

kernel/time/timer.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  *  Kernel internal timers
  *

kernel/time/timer_list.c +1 -0

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL2.0
 /*
  * List pending timers
  *

Greg Kroah-Hartman

2018-03-19 10:37 UTC #4 lore raw

Re: [patch 02/3] time: Add SPDX license identifiers

Quoted 12 lines · Thomas Gleixner

Update the time(r) core files files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Philippe Ombredanne, Kate Stewart and myself. The data has been created with two independent license scanners and manual inspection.
The following files do not contain any direct license information and have been omitted from the big initial SPDX changes:

Quoted 7 lines

timeconst.bc: The .bc files were not touched
time.c, timer.c, timekeeping.c: Licence was deduced from EXPORT_SYMBOL_GPL
As those files do not contain direct license references they fall under the project license, i.e. GPL V2 only.
Signed-off-by Thomas Gleixner <[email protected]>

Reviewed-off-by Greg Kroah-Hartman <[email protected]>

Thomas Gleixner

author

2018-03-19 10:04 UTC #5 lore raw

PATCH 3/3 time: Remove license boilerplates and sloppy references

In reply to Thomas Gleixner

Now that the SPDX tag is in all time(r) core files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF or other entities which is never needed.

No copyright headers or other non-license-description text was removed.

Signed-off-by Thomas Gleixner <[email protected]>

---
 include/linux/hrtimer.h         |    2 --
 kernel/time/alarmtimer.c        |    4 ----
 kernel/time/clockevents.c       |    3 ---
 kernel/time/clocksource.c       |   14 --------------
 kernel/time/hrtimer.c           |    2 --
 kernel/time/jiffies.c           |   25 +++++--------------------
 kernel/time/posix-clock.c       |   14 --------------
 kernel/time/posix-stubs.c       |    4 ----
 kernel/time/posix-timers.c      |   20 +-------------------
 kernel/time/sched_clock.c       |    4 ----
 kernel/time/test_udelay.c       |    9 ---------
 kernel/time/tick-broadcast.c    |    3 ---
 kernel/time/tick-common.c       |    3 ---
 kernel/time/tick-oneshot.c      |    3 ---
 kernel/time/tick-sched.c        |    2 --
 kernel/time/timeconv.c          |   17 -----------------
 kernel/time/timecounter.c       |   10 ----------
 kernel/time/timekeeping_debug.c |   10 ----------
 kernel/time/timer_list.c        |    4 ----
 19 files changed, 6 insertions(+), 147 deletions(-)

include/linux/hrtimer.h +0 -2

@@ -8,8 +8,6 @@
  *  data type definitions, declarations, prototypes
  *
  *  Started by: Thomas Gleixner and Ingo Molnar
- *
- *  For licencing details see kernel-base/COPYING
  */
 #ifndef _LINUX_HRTIMER_H
 #define _LINUX_HRTIMER_H

kernel/time/alarmtimer.c +0 -4

@@ -11,10 +11,6 @@
  * Copyright (C) 2010 IBM Corperation
  *
  * Author: John Stultz <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/time.h>
 #include <linux/hrtimer.h>

kernel/time/clockevents.c +0 -3

@@ -5,9 +5,6 @@
  * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner
- *
- * This code is licenced under the GPL version 2. For details see
- * kernel-base/COPYING.
  */
 
 #include <linux/clockchips.h>

kernel/time/clocksource.c +0 ~~-14~~

@@ -3,20 +3,6 @@
  * This file contains the functions which manage clocksource drivers.
  *
  * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
- *
- * 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 distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

kernel/time/hrtimer.c +0 -2

@@ -20,8 +20,6 @@
  *
  *	George Anzinger, Andrew Morton, Steven Rostedt, Roman Zippel
  *	et. al.
- *
- *  For licencing details see kernel-base/COPYING
  */
 
 #include <linux/cpu.h>

kernel/time/jiffies.c +5 ~~-20~~

@@ -1,24 +1,9 @@
 // SPDX-License-Identifier: GPL2.0+
-/***********************************************************************
-* This file contains the jiffies based clocksource.
-*
-* Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
-*
-* 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 distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-************************************************************************/
+/*
+ * This file contains the jiffies based clocksource.
+ *
+ * Copyright (C) 2004, 2005 IBM, John Stultz ([email protected])
+ */
 #include <linux/clocksource.h>
 #include <linux/jiffies.h>
 #include <linux/module.h>

kernel/time/posix-clock.c +0 ~~-14~~

@@ -3,20 +3,6 @@
  * Support for dynamic clock devices
  *
  * Copyright (C) 2010 OMICRON electronics GmbH
- *
- *  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 distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/device.h>
 #include <linux/export.h>

kernel/time/posix-stubs.c +0 -4

@@ -4,10 +4,6 @@
  *
  * Created by:  Nicolas Pitre, July 2016
  * Copyright:   (C) 2016 Linaro Limited
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/linkage.h>

kernel/time/posix-timers.c +1 ~~-19~~

@@ -7,25 +7,7 @@
  * 2004-06-01  Fix CLOCK_REALTIME clock/timer TIMER_ABSTIME bug.
  *			     Copyright (C) 2004 Boris Hu
  *
- * 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 distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * MontaVista Software | 1237 East Arques Avenue | Sunnyvale | CA 94085 | USA
- */
-
-/* These are all the functions necessary to implement
- * POSIX clocks & timers
+ * These are all the functions necessary to implement POSIX clocks & timers
  */
 #include <linux/mm.h>
 #include <linux/interrupt.h>

kernel/time/sched_clock.c +0 -4

@@ -2,10 +2,6 @@
 /*
  * Generic sched_clock() support, to extend low level hardware time
  * counters to full 64-bit ns values.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/clocksource.h>
 #include <linux/init.h>

kernel/time/test_udelay.c +0 -9

@@ -8,15 +8,6 @@
  * Specifying usecs of 0 or negative values will run multiples tests.
  *
  * Copyright (C) 2014 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/debugfs.h>

kernel/time/tick-broadcast.c +0 -3

@@ -6,9 +6,6 @@
  * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner
- *
- * This code is licenced under the GPL version 2. For details see
- * kernel-base/COPYING.
  */
 #include <linux/cpu.h>
 #include <linux/err.h>

kernel/time/tick-common.c +0 -3

@@ -6,9 +6,6 @@
  * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner
- *
- * This code is licenced under the GPL version 2. For details see
- * kernel-base/COPYING.
  */
 #include <linux/cpu.h>
 #include <linux/err.h>

kernel/time/tick-oneshot.c +0 -3

@@ -6,9 +6,6 @@
  * Copyright(C) 2005-2006, Thomas Gleixner <[email protected]>
  * Copyright(C) 2005-2007, Red Hat, Inc., Ingo Molnar
  * Copyright(C) 2006-2007, Timesys Corp., Thomas Gleixner
- *
- * This code is licenced under the GPL version 2. For details see
- * kernel-base/COPYING.
  */
 #include <linux/cpu.h>
 #include <linux/err.h>

kernel/time/tick-sched.c +0 -2

@@ -7,8 +7,6 @@
  *  No idle tick implementation for low and high resolution timers
  *
  *  Started by: Thomas Gleixner and Ingo Molnar
- *
- *  Distribute under GPLv2.
  */
 #include <linux/cpu.h>
 #include <linux/err.h>

kernel/time/timeconv.c +0 ~~-17~~

@@ -4,23 +4,6 @@
  * This file is part of the GNU C Library.
  * Contributed by Paul Eggert ([email protected]).
  *
- * The GNU C Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The GNU C Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the GNU C Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
  * Converts the calendar time to broken-down time representation
  * Based on code from glibc-2.6
  *

kernel/time/timecounter.c +0 ~~-10~~

@@ -1,16 +1,6 @@
 // SPDX-License-Identifier: GPL2.0+
 /*
  * based on code that migrated away from linux/kernel/time/clocksource.c
- *
- * 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 distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/export.h>

kernel/time/timekeeping_debug.c +0 ~~-10~~

@@ -3,16 +3,6 @@
  * debugfs file to track time spent in suspend
  *
  * Copyright (c) 2011, Google, 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 distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
  */
 
 #include <linux/debugfs.h>

kernel/time/timer_list.c +0 -4

@@ -3,10 +3,6 @@
  * List pending timers
  *
  * Copyright(C) 2006, Red Hat, Inc., Ingo Molnar
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <linux/proc_fs.h>

Greg Kroah-Hartman

2018-03-19 10:37 UTC #6 lore raw

Re: [patch 03/3] time: Remove license boilerplates and sloppy references

Quoted 4 lines · Thomas Gleixner

Now that the SPDX tag is in all time(r) core files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.

Quoted 8 lines

This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF or other entities which is never needed.
No copyright headers or other non-license-description text was removed.
Signed-off-by Thomas Gleixner <[email protected]>

Reviewed-off-by Greg Kroah-Hartman <[email protected]>