| Message ID | d2c52284244d6dcb3472d2041abe43b456d116df.1642762977.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v3] powerpc: Add missing SPDX license identifiers | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 7 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
On Fri, Jan 21, 2022 at 11:03:20AM +0000, Christophe Leroy wrote: > Several files are missing SPDX license identifiers. > > Following files are given the following SPDX identifier based on the comments in the top of the file: > > boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ Are you sure that this is the correct license for this file? Also you dropped the arch/powerpc/ prefix here... > include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ > kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 > lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 > mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 > mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 > platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ > xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ > > Add to other files the default kernel license identifier, in extenso GPL-2.0. > > DTS files are handled in a separate commit. > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-spdx@vger.kernel.org > --- > v3: Removed license text and license note in the files that have any. > > v2: Changed from GPL-2.0 to a licence consistant with the file's comments for the few files listed in the commit message. > --- > arch/powerpc/Makefile | 5 +-- > arch/powerpc/boot/44x.h | 5 +-- > arch/powerpc/boot/4xx.h | 5 +-- > arch/powerpc/boot/crtsavres.S | 16 +--------- > arch/powerpc/boot/dummy.c | 1 + > arch/powerpc/boot/install.sh | 5 +-- > arch/powerpc/boot/ops.h | 6 ++-- > arch/powerpc/boot/serial.c | 6 ++-- > arch/powerpc/boot/simple_alloc.c | 6 ++-- > arch/powerpc/include/asm/8xx_immap.h | 1 + > arch/powerpc/include/asm/asm-compat.h | 1 + > arch/powerpc/include/asm/asm-const.h | 1 + > arch/powerpc/include/asm/asm-offsets.h | 1 + > arch/powerpc/include/asm/cpm.h | 1 + > arch/powerpc/include/asm/dtl.h | 1 + > arch/powerpc/include/asm/edac.h | 6 ++-- > arch/powerpc/include/asm/ehv_pic.h | 5 +-- > arch/powerpc/include/asm/emergency-restart.h | 1 + > arch/powerpc/include/asm/epapr_hcalls.h | 32 +------------------ > arch/powerpc/include/asm/fixmap.h | 5 +-- > arch/powerpc/include/asm/floppy.h | 5 +-- > arch/powerpc/include/asm/fs_pd.h | 5 +-- > arch/powerpc/include/asm/fsl_hcalls.h | 32 +------------------ > arch/powerpc/include/asm/hydra.h | 5 +-- > arch/powerpc/include/asm/ibmebus.h | 29 +---------------- > arch/powerpc/include/asm/kgdb.h | 6 ++-- > arch/powerpc/include/asm/membarrier.h | 1 + > arch/powerpc/include/asm/module.lds.h | 1 + > arch/powerpc/include/asm/mpc52xx.h | 5 +-- > arch/powerpc/include/asm/mpc52xx_psc.h | 5 +-- > arch/powerpc/include/asm/pmac_feature.h | 5 +-- > arch/powerpc/include/asm/ppc_asm.h | 1 + > arch/powerpc/include/asm/pte-walk.h | 1 + > arch/powerpc/include/asm/rheap.h | 6 ++-- > arch/powerpc/include/asm/sfp-machine.h | 16 +--------- > arch/powerpc/include/asm/vmalloc.h | 1 + > arch/powerpc/include/asm/word-at-a-time.h | 1 + > arch/powerpc/kernel/interrupt_64.S | 1 + > arch/powerpc/kernel/kgdb.c | 5 +-- > arch/powerpc/kernel/ptrace/ptrace.c | 5 +-- > arch/powerpc/kernel/ptrace/ptrace32.c | 5 +-- > arch/powerpc/kernel/signal.c | 5 +-- > arch/powerpc/kernel/signal.h | 5 +-- > arch/powerpc/kernel/vdso32/note.S | 1 + > arch/powerpc/kernel/vdso64/note.S | 1 + > arch/powerpc/kvm/mpic.c | 19 +---------- > arch/powerpc/lib/crtsavres.S | 16 +--------- > arch/powerpc/lib/restart_table.c | 1 + > arch/powerpc/lib/rheap.c | 6 ++-- > arch/powerpc/mm/book3s64/hash_4k.c | 10 +----- > arch/powerpc/mm/book3s64/hash_64k.c | 10 +----- > arch/powerpc/mm/book3s64/hash_hugepage.c | 10 +----- > arch/powerpc/mm/hugetlbpage.c | 1 + > arch/powerpc/perf/req-gen/_end.h | 1 + > arch/powerpc/platforms/44x/fsp2.h | 1 + > arch/powerpc/platforms/4xx/pci.c | 1 + > arch/powerpc/platforms/4xx/pci.h | 1 + > arch/powerpc/platforms/52xx/efika.c | 5 +-- > arch/powerpc/platforms/52xx/mpc52xx_common.c | 6 +--- > arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +-- > arch/powerpc/platforms/52xx/mpc52xx_pic.c | 6 +--- > arch/powerpc/platforms/85xx/ksi8560.c | 6 ++-- > arch/powerpc/platforms/85xx/p1022_ds.c | 5 +-- > arch/powerpc/platforms/85xx/p1022_rdk.c | 5 +-- > arch/powerpc/platforms/8xx/ep88xc.c | 5 +-- > arch/powerpc/platforms/8xx/mpc86xads.h | 5 ++- > arch/powerpc/platforms/8xx/mpc86xads_setup.c | 5 +-- > arch/powerpc/platforms/8xx/mpc885ads.h | 5 ++- > arch/powerpc/platforms/8xx/mpc885ads_setup.c | 5 +-- > arch/powerpc/platforms/8xx/mpc8xx.h | 5 +-- > arch/powerpc/platforms/8xx/pic.c | 1 + > arch/powerpc/platforms/8xx/pic.h | 1 + > arch/powerpc/platforms/8xx/tqm8xx_setup.c | 5 +-- > .../cell/spufs/spu_restore_dump.h_shipped | 1 + > .../cell/spufs/spu_save_dump.h_shipped | 1 + > arch/powerpc/platforms/chrp/gg2.h | 5 +-- > .../platforms/embedded6xx/linkstation.c | 5 +-- > arch/powerpc/platforms/embedded6xx/ls_uart.c | 5 +-- > arch/powerpc/platforms/embedded6xx/mpc10x.h | 6 ++-- > .../platforms/embedded6xx/storcenter.c | 5 +-- > arch/powerpc/platforms/microwatt/Makefile | 1 + > arch/powerpc/platforms/microwatt/setup.c | 1 + > arch/powerpc/platforms/pseries/ibmebus.c | 29 +---------------- > arch/powerpc/sysdev/cpm2.c | 5 +-- > arch/powerpc/sysdev/cpm2_pic.c | 5 +-- > arch/powerpc/sysdev/ehv_pic.c | 5 +-- > arch/powerpc/sysdev/ge/ge_pic.c | 5 +-- > arch/powerpc/sysdev/mpic.c | 5 +-- > arch/powerpc/sysdev/rtc_cmos_setup.c | 6 ++-- > arch/powerpc/tools/ci-build.sh | 1 + > arch/powerpc/tools/head_check.sh | 6 +--- > arch/powerpc/xmon/ppc.h | 15 ++------- > 92 files changed, 105 insertions(+), 422 deletions(-) You might want to change less of these at once, as this is hard to review as-is. > diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S > index 085fb2b9a8b8..25e924459dcc 100644 > --- a/arch/powerpc/boot/crtsavres.S > +++ b/arch/powerpc/boot/crtsavres.S > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Special support for eabi and SVR4 > * > @@ -7,11 +8,6 @@ > * > * Based on gcc/config/rs6000/crtsavres.asm from gcc > * > - * This file 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, or (at your option) any > - * later version. > - * > * In addition to the permissions in the GNU General Public License, the > * Free Software Foundation gives you unlimited permission to link the > * compiled version of this file with other programs, and to distribute > @@ -20,16 +16,6 @@ > * respects; for example, they cover modification of the file, and > * distribution when not linked into another program.) > * > - * This file 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; see the file COPYING. If not, write to > - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, > - * Boston, MA 02110-1301, USA. > - * > * As a special exception, if you link this library with files > * compiled with GCC to produce an executable, this does not cause > * the resulting executable to be covered by the GNU General Public License. Look at that "special exception", why are you ignoring it here? You can't do that :( Please do these in smaller batches, perhaps one patch per type of license and directory to make it easier to notice mistakes like this? thanks, greg k-h
On Fri, Jan 21, 2022 at 11:03:20AM +0000, Christophe Leroy wrote: > Several files are missing SPDX license identifiers. > > Following files are given the following SPDX identifier based on the comments in the top of the file: Nit, please wrap your changelog text properly. > > boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ > kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 > lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 > mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 > mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 > platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ > xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ > > Add to other files the default kernel license identifier, in extenso GPL-2.0. That might be good for a single commit alone, don't mix it up with the other files that you are removing stuff from. thanks, greg k-h
Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit : > On Fri, Jan 21, 2022 at 11:03:20AM +0000, Christophe Leroy wrote: >> Several files are missing SPDX license identifiers. >> >> Following files are given the following SPDX identifier based on the comments in the top of the file: >> >> boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > > Are you sure that this is the correct license for this file? it says "... GNU General Public License ... either version 2, or (at your option) any later version". Isn't it what GPL-2.0+ means ? > > Also you dropped the arch/powerpc/ prefix here... Yes I did, for clarity, to get shorter lines. > > >> include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ >> include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ >> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ >> include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ >> kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 >> lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ >> mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 >> mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 >> mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 >> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD >> tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ >> xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ >> >> Add to other files the default kernel license identifier, in extenso GPL-2.0. >> >> DTS files are handled in a separate commit. >> >> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> Cc: linux-spdx@vger.kernel.org >> --- >> v3: Removed license text and license note in the files that have any. >> >> v2: Changed from GPL-2.0 to a licence consistant with the file's comments for the few files listed in the commit message. >> --- ... >> 92 files changed, 105 insertions(+), 422 deletions(-) > > You might want to change less of these at once, as this is hard to > review as-is. Ok > >> diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S >> index 085fb2b9a8b8..25e924459dcc 100644 >> --- a/arch/powerpc/boot/crtsavres.S >> +++ b/arch/powerpc/boot/crtsavres.S >> @@ -1,3 +1,4 @@ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> /* >> * Special support for eabi and SVR4 >> * >> @@ -7,11 +8,6 @@ >> * >> * Based on gcc/config/rs6000/crtsavres.asm from gcc >> * >> - * This file 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, or (at your option) any >> - * later version. >> - * >> * In addition to the permissions in the GNU General Public License, the >> * Free Software Foundation gives you unlimited permission to link the >> * compiled version of this file with other programs, and to distribute >> @@ -20,16 +16,6 @@ >> * respects; for example, they cover modification of the file, and >> * distribution when not linked into another program.) >> * >> - * This file 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; see the file COPYING. If not, write to >> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, >> - * Boston, MA 02110-1301, USA. >> - * >> * As a special exception, if you link this library with files >> * compiled with GCC to produce an executable, this does not cause >> * the resulting executable to be covered by the GNU General Public License. > > Look at that "special exception", why are you ignoring it here? You > can't do that :( I'm not ignoring it, that's the reason why I left it. Isn't it the correct way to do ? How should it be done ? Christophe
On Fri, Jan 21, 2022 at 03:13:50PM +0000, Christophe Leroy wrote: > > > Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit : > > On Fri, Jan 21, 2022 at 11:03:20AM +0000, Christophe Leroy wrote: > >> Several files are missing SPDX license identifiers. > >> > >> Following files are given the following SPDX identifier based on the comments in the top of the file: > >> > >> boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > > > > Are you sure that this is the correct license for this file? > > it says "... GNU General Public License ... either version 2, or (at > your option) any later version". > > Isn't it what GPL-2.0+ means ? Yes, but look further down, as I point out below... > >> include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > >> include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > >> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > >> include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ > >> kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 > >> lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > >> mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 > >> mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 > >> mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 > >> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > >> tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ > >> xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ > >> > >> Add to other files the default kernel license identifier, in extenso GPL-2.0. > >> > >> DTS files are handled in a separate commit. > >> > >> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > >> Cc: Thomas Gleixner <tglx@linutronix.de> > >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > >> Cc: linux-spdx@vger.kernel.org > >> --- > >> v3: Removed license text and license note in the files that have any. > >> > >> v2: Changed from GPL-2.0 to a licence consistant with the file's comments for the few files listed in the commit message. > >> --- > > ... > > >> 92 files changed, 105 insertions(+), 422 deletions(-) > > > > You might want to change less of these at once, as this is hard to > > review as-is. > > Ok > > > > >> diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S > >> index 085fb2b9a8b8..25e924459dcc 100644 > >> --- a/arch/powerpc/boot/crtsavres.S > >> +++ b/arch/powerpc/boot/crtsavres.S > >> @@ -1,3 +1,4 @@ > >> +/* SPDX-License-Identifier: GPL-2.0+ */ > >> /* > >> * Special support for eabi and SVR4 > >> * > >> @@ -7,11 +8,6 @@ > >> * > >> * Based on gcc/config/rs6000/crtsavres.asm from gcc > >> * > >> - * This file 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, or (at your option) any > >> - * later version. > >> - * > >> * In addition to the permissions in the GNU General Public License, the > >> * Free Software Foundation gives you unlimited permission to link the > >> * compiled version of this file with other programs, and to distribute > >> @@ -20,16 +16,6 @@ > >> * respects; for example, they cover modification of the file, and > >> * distribution when not linked into another program.) > >> * > >> - * This file 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; see the file COPYING. If not, write to > >> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, > >> - * Boston, MA 02110-1301, USA. > >> - * > >> * As a special exception, if you link this library with files > >> * compiled with GCC to produce an executable, this does not cause > >> * the resulting executable to be covered by the GNU General Public License. > > > > Look at that "special exception", why are you ignoring it here? You > > can't do that :( > > I'm not ignoring it, that's the reason why I left it. You ignore that part of the license in the SPDX line, why? > Isn't it the correct way to do ? How should it be done ? You need to properly describe this in the SPDX line. You did not do so here, which means that any tool just looking at the SPDX line would get this license wrong. thanks, greg k-h
Le 21/01/2022 à 16:19, Greg Kroah-Hartman a écrit : > On Fri, Jan 21, 2022 at 03:13:50PM +0000, Christophe Leroy wrote: >> >> >> Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit : ... >>>> @@ -20,16 +16,6 @@ >>>> * respects; for example, they cover modification of the file, and >>>> * distribution when not linked into another program.) >>>> * >>>> - * This file 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; see the file COPYING. If not, write to >>>> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, >>>> - * Boston, MA 02110-1301, USA. >>>> - * >>>> * As a special exception, if you link this library with files >>>> * compiled with GCC to produce an executable, this does not cause >>>> * the resulting executable to be covered by the GNU General Public License. >>> >>> Look at that "special exception", why are you ignoring it here? You >>> can't do that :( >> >> I'm not ignoring it, that's the reason why I left it. > > You ignore that part of the license in the SPDX line, why? > >> Isn't it the correct way to do ? How should it be done ? > > You need to properly describe this in the SPDX line. You did not do so > here, which means that any tool just looking at the SPDX line would get > this license wrong. How do you describe such an exception on the SPDX line then ? You add " WITH GCC-exception-2.0" to the SPDX line ? Am I understanding correctly ? Thanks Christophe
On Fri, Jan 21, 2022 at 03:34:24PM +0000, Christophe Leroy wrote: > > > Le 21/01/2022 à 16:19, Greg Kroah-Hartman a écrit : > > On Fri, Jan 21, 2022 at 03:13:50PM +0000, Christophe Leroy wrote: > >> > >> > >> Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit : > > ... > > >>>> @@ -20,16 +16,6 @@ > >>>> * respects; for example, they cover modification of the file, and > >>>> * distribution when not linked into another program.) > >>>> * > >>>> - * This file 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; see the file COPYING. If not, write to > >>>> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, > >>>> - * Boston, MA 02110-1301, USA. > >>>> - * > >>>> * As a special exception, if you link this library with files > >>>> * compiled with GCC to produce an executable, this does not cause > >>>> * the resulting executable to be covered by the GNU General Public License. > >>> > >>> Look at that "special exception", why are you ignoring it here? You > >>> can't do that :( > >> > >> I'm not ignoring it, that's the reason why I left it. > > > > You ignore that part of the license in the SPDX line, why? > > > >> Isn't it the correct way to do ? How should it be done ? > > > > You need to properly describe this in the SPDX line. You did not do so > > here, which means that any tool just looking at the SPDX line would get > > this license wrong. > > How do you describe such an exception on the SPDX line then ? > > You add " WITH GCC-exception-2.0" to the SPDX line ? Am I understanding > correctly ? I do not know, please ask the SPDX people. There's a reason we didn't catch these files in our original sweep, and that is because they take some manual work. Which is great to see you doing, but realize it isn't as simple as your first set of patches were :) thanks, greg k-h
On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy <christophe.leroy@csgroup.eu> wrote: > > Several files are missing SPDX license identifiers. > > Following files are given the following SPDX identifier based on the comments in the top of the file: > > include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ "BSD" is not a defined SPDX identifier. I believe what you want here is "BSD-3-Clause" (see: https://spdx.org/licenses/BSD-3-Clause.html) Richard
On Fri, Jan 21, 2022 at 04:19:12PM +0100, Greg Kroah-Hartman wrote: > On Fri, Jan 21, 2022 at 03:13:50PM +0000, Christophe Leroy wrote: > > >> - * This file 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, or (at your option) any > > >> - * later version. [ ... ] > > >> * As a special exception, if you link this library with files > > >> * compiled with GCC to produce an executable, this does not cause > > >> * the resulting executable to be covered by the GNU General Public License. The "as a special exception" refers to "This file is free software; you can redistribute it and/or modify it". It is meaningless without having anything it is an exception *to* :-) In general, you should never edit licence texts. > > > Look at that "special exception", why are you ignoring it here? You > > > can't do that :( > > > > I'm not ignoring it, that's the reason why I left it. > > You ignore that part of the license in the SPDX line, why? > > > Isn't it the correct way to do ? How should it be done ? > > You need to properly describe this in the SPDX line. You did not do so > here, which means that any tool just looking at the SPDX line would get > this license wrong. A new label needs to be defined and documented. Should be pretty mechanical to do, but that should see a wider audience than the powerpc hackers :-) Segher
On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy <christophe.leroy@csgroup.eu> wrote: > > Several files are missing SPDX license identifiers. > > Following files are given the following SPDX identifier based on the comments in the top of the file: > > include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ [...] > platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD "OpenIB BSD" is not a defined SPDX identifier. There is an SPDX identifier "Linux-OpenIB" https://spdx.org/licenses/Linux-OpenIB.html but I believe that is not a match to what's in these files (specifically, the wording of the disclaimer), rather I believe what you want here is BSD-2-Clause, but you may want to check that. Richard
I just saw this and have not followed the entire thread from the beginning, but if you are unsure if a given license text to something on the SPDX License List, I highly recommend using the SPDX License-diff browser extension / add-on (for Chrome or Firefox) - once you have that, you can simply highlight a text in your browser window and it will tell you if it matches or how far off it is if not. If a license is NOT a match to anything on the SPDX License List, please submit it to the SPDX legal team here: https://tools.spdx.org/app/submit_new_license/ (and preferably then tag me in the Github issue, my Github ide is @jlovejoy ) Please make sure to include that it's in the LInux kernel and a link to where you found it. More about requesting a new license be added to the SPDX License List can be found here: https://github.com/spdx/license-list-XML/blob/master/DOCS/request-new-license.md Thanks! Jilayne SPDX legal team co-lead On 1/21/22 10:17 AM, Richard Fontana wrote: > On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy > <christophe.leroy@csgroup.eu> wrote: >> Several files are missing SPDX license identifiers. >> >> Following files are given the following SPDX identifier based on the comments in the top of the file: >> >> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > [...] >> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > "OpenIB BSD" is not a defined SPDX identifier. There is an SPDX > identifier "Linux-OpenIB" > https://spdx.org/licenses/Linux-OpenIB.html > but I believe that is not a match to what's in these files > (specifically, the wording of the disclaimer), rather I believe what > you want here is BSD-2-Clause, but you may want to check that. > > Richard >
(trying this again, as first time, my message bounced) I just saw this and have not followed the entire thread from the beginning, but if you are unsure if a given license text to something on the SPDX License List, I highly recommend using the SPDX License-diff browser extension / add-on (for Chrome or Firefox) - once you have that, you can simply highlight a text in your browser window and it will tell you if it matches or how far off it is if not. If a license is NOT a match to anything on the SPDX License List, please submit it to the SPDX legal team here: https://tools.spdx.org/app/submit_new_license/ (and preferably then tag me in the Github issue, my Github ide is @jlovejoy ) Please make sure to include that it's in the LInux kernel and a link to where you found it. More about requesting a new license be added to the SPDX License List can be found here: https://github.com/spdx/license-list-XML/blob/master/DOCS/request-new-license.md Thanks! Jilayne SPDX legal team co-lead > On Jan 21, 2022, at 10:17 AM, Richard Fontana <rfontana@redhat.com> wrote: > > On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy > <christophe.leroy@csgroup.eu> wrote: >> >> Several files are missing SPDX license identifiers. >> >> Following files are given the following SPDX identifier based on the comments in the top of the file: >> >> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > [...] >> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > > "OpenIB BSD" is not a defined SPDX identifier. There is an SPDX > identifier "Linux-OpenIB" > https://spdx.org/licenses/Linux-OpenIB.html > but I believe that is not a match to what's in these files > (specifically, the wording of the disclaimer), rather I believe what > you want here is BSD-2-Clause, but you may want to check that. > > Richard >
> On Fri, Jan 21, 2022 at 03:13:50PM +0000, Christophe Leroy wrote: > > Isn't it what GPL-2.0+ means ? Greg Kroah-Hartman wrote: > Yes, but look further down, as I point out below... > > > >> include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > > >> include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ > > >> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ > > >> include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ > > >> kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 > > >> lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ > > >> mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 > > >> mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 > > >> mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 > > >> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD > > >> tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ > > >> xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ If you're combining GPLv2-or-later works with LGPLv2.0/2.1 works, you'll have to normalize to some GPLv2-based license (such as GPLv2-or-later), since LGPLv2.1 requires that for combinations. You won't be able to carry along the "OR 3-Clause-BSD" part once the combination is made. Similarly true with GPLv2-or-later, but LGPL is the interesting one because it's explicit about the need to change license notices to GPL notices when you combine. -- bkuhn
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 5f16ac1583c5..2676ced4d901 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -1,10 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 # This file is included by the global makefile so that you can add your own # architecture-specific flags and dependencies. # -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# # Copyright (C) 1994 by Linus Torvalds # Changes for PPC by Gary Thomas # Rewritten by Cort Dougan and Paul Mackerras diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h index 02563443788a..9b15e59522d6 100644 --- a/arch/powerpc/boot/44x.h +++ b/arch/powerpc/boot/44x.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PowerPC 44x related functions * * Copyright 2007 David Gibson, IBM Corporation. - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #ifndef _PPC_BOOT_44X_H_ #define _PPC_BOOT_44X_H_ diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h index 7dc5d45361bc..77f15d124c81 100644 --- a/arch/powerpc/boot/4xx.h +++ b/arch/powerpc/boot/4xx.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PowerPC 4xx related functions * * Copyright 2007 IBM Corporation. * Josh Boyer <jwboyer@linux.vnet.ibm.com> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #ifndef _POWERPC_BOOT_4XX_H_ #define _POWERPC_BOOT_4XX_H_ diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S index 085fb2b9a8b8..25e924459dcc 100644 --- a/arch/powerpc/boot/crtsavres.S +++ b/arch/powerpc/boot/crtsavres.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Special support for eabi and SVR4 * @@ -7,11 +8,6 @@ * * Based on gcc/config/rs6000/crtsavres.asm from gcc * - * This file 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, or (at your option) any - * later version. - * * In addition to the permissions in the GNU General Public License, the * Free Software Foundation gives you unlimited permission to link the * compiled version of this file with other programs, and to distribute @@ -20,16 +16,6 @@ * respects; for example, they cover modification of the file, and * distribution when not linked into another program.) * - * This file 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; see the file COPYING. If not, write to - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * * As a special exception, if you link this library with files * compiled with GCC to produce an executable, this does not cause * the resulting executable to be covered by the GNU General Public License. diff --git a/arch/powerpc/boot/dummy.c b/arch/powerpc/boot/dummy.c index 31dbf45bf99c..3f9ccbf52783 100644 --- a/arch/powerpc/boot/dummy.c +++ b/arch/powerpc/boot/dummy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 int main(void) { return 0; diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh index 14473150ddb4..a03ab59984a3 100644 --- a/arch/powerpc/boot/install.sh +++ b/arch/powerpc/boot/install.sh @@ -1,8 +1,5 @@ #!/bin/sh -# -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. +# SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 1995 by Linus Torvalds # diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h index 6455fc9a244f..250d2079ebe5 100644 --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Global definition of all the bootwrapper operations. * * Author: Mark A. Greer <mgreer@mvista.com> * - * 2006 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2006 (c) MontaVista Software, Inc. */ #ifndef _PPC_BOOT_OPS_H_ #define _PPC_BOOT_OPS_H_ diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c index 54d2522be485..c6d32a8c3612 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Generic serial console support * @@ -6,10 +7,7 @@ * Code in serial_edit_cmdline() copied from <file:arch/ppc/boot/simple/misc.c> * and was written by Matt Porter <mporter@kernel.crashing.org>. * - * 2001,2006 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2001,2006 (c) MontaVista Software, Inc. */ #include <stdarg.h> #include <stddef.h> diff --git a/arch/powerpc/boot/simple_alloc.c b/arch/powerpc/boot/simple_alloc.c index 65ec135d0157..267d6524caac 100644 --- a/arch/powerpc/boot/simple_alloc.c +++ b/arch/powerpc/boot/simple_alloc.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Implement primitive realloc(3) functionality. * * Author: Mark A. Greer <mgreer@mvista.com> * - * 2006 (c) MontaVista, Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2006 (c) MontaVista, Software, Inc. */ #include <stddef.h> diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h index bdf0563ba423..0cd91d52e3fd 100644 --- a/arch/powerpc/include/asm/8xx_immap.h +++ b/arch/powerpc/include/asm/8xx_immap.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MPC8xx Internal Memory Map * Copyright (c) 1997 Dan Malek (dmalek@jlc.net) diff --git a/arch/powerpc/include/asm/asm-compat.h b/arch/powerpc/include/asm/asm-compat.h index 2b736d9fbb1b..a6cdaf40d7b4 100644 --- a/arch/powerpc/include/asm/asm-compat.h +++ b/arch/powerpc/include/asm/asm-compat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_ASM_COMPAT_H #define _ASM_POWERPC_ASM_COMPAT_H diff --git a/arch/powerpc/include/asm/asm-const.h b/arch/powerpc/include/asm/asm-const.h index bfb3c3534877..922ba500c3f2 100644 --- a/arch/powerpc/include/asm/asm-const.h +++ b/arch/powerpc/include/asm/asm-const.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_ASM_CONST_H #define _ASM_POWERPC_ASM_CONST_H diff --git a/arch/powerpc/include/asm/asm-offsets.h b/arch/powerpc/include/asm/asm-offsets.h index d370ee36a182..9f8535716392 100644 --- a/arch/powerpc/include/asm/asm-offsets.h +++ b/arch/powerpc/include/asm/asm-offsets.h @@ -1 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <generated/asm-offsets.h> diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h index ce483b0f8a4d..475781aa71c5 100644 --- a/arch/powerpc/include/asm/cpm.h +++ b/arch/powerpc/include/asm/cpm.h @@ -1 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <soc/fsl/cpm.h> diff --git a/arch/powerpc/include/asm/dtl.h b/arch/powerpc/include/asm/dtl.h index 1625888f27ef..1368c2963dfd 100644 --- a/arch/powerpc/include/asm/dtl.h +++ b/arch/powerpc/include/asm/dtl.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_DTL_H #define _ASM_POWERPC_DTL_H diff --git a/arch/powerpc/include/asm/edac.h b/arch/powerpc/include/asm/edac.h index 5571e23d253e..cec2b744cac1 100644 --- a/arch/powerpc/include/asm/edac.h +++ b/arch/powerpc/include/asm/edac.h @@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PPC EDAC common defs * * Author: Dave Jiang <djiang@mvista.com> * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2007 (c) MontaVista Software, Inc. */ #ifndef ASM_EDAC_H #define ASM_EDAC_H diff --git a/arch/powerpc/include/asm/ehv_pic.h b/arch/powerpc/include/asm/ehv_pic.h index dc7d48e3ea90..28a341409ef5 100644 --- a/arch/powerpc/include/asm/ehv_pic.h +++ b/arch/powerpc/include/asm/ehv_pic.h @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * EHV_PIC private definitions and structure. * * Copyright 2008-2010 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #ifndef __EHV_PIC_H__ #define __EHV_PIC_H__ diff --git a/arch/powerpc/include/asm/emergency-restart.h b/arch/powerpc/include/asm/emergency-restart.h index 3711bd9d50bd..ba702050dced 100644 --- a/arch/powerpc/include/asm/emergency-restart.h +++ b/arch/powerpc/include/asm/emergency-restart.h @@ -1 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <asm-generic/emergency-restart.h> diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h index c99ba08a408d..1ff3e9006c5f 100644 --- a/arch/powerpc/include/asm/epapr_hcalls.h +++ b/arch/powerpc/include/asm/epapr_hcalls.h @@ -1,40 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ /* * ePAPR hcall interface * * Copyright 2008-2011 Freescale Semiconductor, Inc. * * Author: Timur Tabi <timur@freescale.com> - * - * This file is provided under a dual BSD/GPL license. When using or - * redistributing this file, you may do so under either license. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Freescale Semiconductor nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * - * ALTERNATIVELY, this software may be distributed under the terms of the - * GNU General Public License ("GPL") as published by the Free Software - * Foundation, either version 2 of that License or (at your option) any - * later version. - * - * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* A "hypercall" is an "sc 1" instruction. This header file provides C diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h index a832aeafe560..d3566d6ddf5e 100644 --- a/arch/powerpc/include/asm/fixmap.h +++ b/arch/powerpc/include/asm/fixmap.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * fixmap.h: compile-time virtual memory allocation * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 1998 Ingo Molnar * * Copyright 2008 Freescale Semiconductor Inc. diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h index f8ce178b43b7..caa670f5b18e 100644 --- a/arch/powerpc/include/asm/floppy.h +++ b/arch/powerpc/include/asm/floppy.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Architecture specific parts of the Floppy driver * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 1995 */ #ifndef __ASM_POWERPC_FLOPPY_H diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h index 8def56ec05c6..92012ff65f4d 100644 --- a/arch/powerpc/include/asm/fs_pd.h +++ b/arch/powerpc/include/asm/fs_pd.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Platform information definitions. * * 2006 (c) MontaVista Software, Inc. * Vitaly Bordug <vbordug@ru.mvista.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #ifndef FS_PD_H diff --git a/arch/powerpc/include/asm/fsl_hcalls.h b/arch/powerpc/include/asm/fsl_hcalls.h index b889d13547fd..e1a780a8aed2 100644 --- a/arch/powerpc/include/asm/fsl_hcalls.h +++ b/arch/powerpc/include/asm/fsl_hcalls.h @@ -1,40 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ /* * Freescale hypervisor call interface * * Copyright 2008-2010 Freescale Semiconductor, Inc. * * Author: Timur Tabi <timur@freescale.com> - * - * This file is provided under a dual BSD/GPL license. When using or - * redistributing this file, you may do so under either license. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Freescale Semiconductor nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * - * ALTERNATIVELY, this software may be distributed under the terms of the - * GNU General Public License ("GPL") as published by the Free Software - * Foundation, either version 2 of that License or (at your option) any - * later version. - * - * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _FSL_HCALLS_H diff --git a/arch/powerpc/include/asm/hydra.h b/arch/powerpc/include/asm/hydra.h index d024447283a0..f61afdc597a3 100644 --- a/arch/powerpc/include/asm/hydra.h +++ b/arch/powerpc/include/asm/hydra.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * include/asm-ppc/hydra.h -- Mac I/O `Hydra' definitions * @@ -14,10 +15,6 @@ * You can obtain paper copies of this book from computer bookstores or by * writing Morgan Kaufmann Publishers, Inc., 340 Pine Street, Sixth Floor, San * Francisco, CA 94104. Reference ISBN 1-55860-393-X. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. */ #ifndef _ASMPPC_HYDRA_H diff --git a/arch/powerpc/include/asm/ibmebus.h b/arch/powerpc/include/asm/ibmebus.h index 088f95b2e14f..8232260abc9a 100644 --- a/arch/powerpc/include/asm/ibmebus.h +++ b/arch/powerpc/include/asm/ibmebus.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ /* * IBM PowerPC eBus Infrastructure Support. * @@ -6,34 +7,6 @@ * Heiko J Schick <schickhj@de.ibm.com> * * All rights reserved. - * - * This source code is distributed under a dual license of GPL v2.0 and OpenIB - * BSD. - * - * OpenIB BSD License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. */ #ifndef _ASM_EBUS_H diff --git a/arch/powerpc/include/asm/kgdb.h b/arch/powerpc/include/asm/kgdb.h index a9e098a3b881..e5745e6ac2ee 100644 --- a/arch/powerpc/include/asm/kgdb.h +++ b/arch/powerpc/include/asm/kgdb.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * The PowerPC (32/64) specific defines / externs for KGDB. Based on * the previous 32bit and 64bit specific files, which had the following @@ -12,10 +13,7 @@ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) * Author: Tom Rini <trini@kernel.crashing.org> * - * 2006 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2006 (c) MontaVista Software, Inc. */ #ifdef __KERNEL__ #ifndef __POWERPC_KGDB_H__ diff --git a/arch/powerpc/include/asm/membarrier.h b/arch/powerpc/include/asm/membarrier.h index de7f79157918..012bba812c3a 100644 --- a/arch/powerpc/include/asm/membarrier.h +++ b/arch/powerpc/include/asm/membarrier.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_MEMBARRIER_H #define _ASM_POWERPC_MEMBARRIER_H diff --git a/arch/powerpc/include/asm/module.lds.h b/arch/powerpc/include/asm/module.lds.h index cea5dc124be4..a4dd672e8c6a 100644 --- a/arch/powerpc/include/asm/module.lds.h +++ b/arch/powerpc/include/asm/module.lds.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Force alignment of .toc section. */ SECTIONS { diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h index ce1e0aabaa64..a7cf158168d8 100644 --- a/arch/powerpc/include/asm/mpc52xx.h +++ b/arch/powerpc/include/asm/mpc52xx.h @@ -1,13 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Prototypes, etc. for the Freescale MPC52xx embedded cpu chips * May need to be cleaned as the port goes on ... * * Copyright (C) 2004-2005 Sylvain Munaut <tnt@246tNt.com> * Copyright (C) 2003 MontaVista, Software, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #ifndef __ASM_POWERPC_MPC52xx_H__ diff --git a/arch/powerpc/include/asm/mpc52xx_psc.h b/arch/powerpc/include/asm/mpc52xx_psc.h index ec995b289280..274bcfdc55de 100644 --- a/arch/powerpc/include/asm/mpc52xx_psc.h +++ b/arch/powerpc/include/asm/mpc52xx_psc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * include/asm-ppc/mpc52xx_psc.h * @@ -13,10 +14,6 @@ * * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com> * Copyright (C) 2003 MontaVista, Software, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #ifndef __ASM_MPC52xx_PSC_H__ diff --git a/arch/powerpc/include/asm/pmac_feature.h b/arch/powerpc/include/asm/pmac_feature.h index e08e829261b6..8f3aad3c1de9 100644 --- a/arch/powerpc/include/asm/pmac_feature.h +++ b/arch/powerpc/include/asm/pmac_feature.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Definition of platform feature hooks for PowerMacs * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 1998 Paul Mackerras & * Ben. Herrenschmidt. * diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index 3c06a33b5da4..d9c6f12e6d3e 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 1995-1999 Gary Thomas, Paul Mackerras, Cort Dougan. */ diff --git a/arch/powerpc/include/asm/pte-walk.h b/arch/powerpc/include/asm/pte-walk.h index 714a35f0d425..dc8bd55e749f 100644 --- a/arch/powerpc/include/asm/pte-walk.h +++ b/arch/powerpc/include/asm/pte-walk.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_PTE_WALK_H #define _ASM_POWERPC_PTE_WALK_H diff --git a/arch/powerpc/include/asm/rheap.h b/arch/powerpc/include/asm/rheap.h index 8e83703d6736..9dc2ca8ff16d 100644 --- a/arch/powerpc/include/asm/rheap.h +++ b/arch/powerpc/include/asm/rheap.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * include/asm-ppc/rheap.h * @@ -5,10 +6,7 @@ * * Author: Pantelis Antoniou <panto@intracom.gr> * - * 2004 (c) INTRACOM S.A. Greece. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2004 (c) INTRACOM S.A. Greece. */ #ifndef __ASM_PPC_RHEAP_H__ diff --git a/arch/powerpc/include/asm/sfp-machine.h b/arch/powerpc/include/asm/sfp-machine.h index 8b957aabb826..3bd0f284fda7 100644 --- a/arch/powerpc/include/asm/sfp-machine.h +++ b/arch/powerpc/include/asm/sfp-machine.h @@ -1,22 +1,8 @@ +/* SPDX-License-Identifier: LGPL-2.0+ */ /* Machine-dependent software floating-point definitions. PPC version. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - 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. - Actually, this is a PPC (32bit) version, written based on the i386, sparc, and sparc64 versions, by me, Peter Maydell (pmaydell@chiark.greenend.org.uk). diff --git a/arch/powerpc/include/asm/vmalloc.h b/arch/powerpc/include/asm/vmalloc.h index 4c69ece52a31..6f8df6b07c8a 100644 --- a/arch/powerpc/include/asm/vmalloc.h +++ b/arch/powerpc/include/asm/vmalloc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_VMALLOC_H #define _ASM_POWERPC_VMALLOC_H diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h index f3f4710d4ff5..96245747720d 100644 --- a/arch/powerpc/include/asm/word-at-a-time.h +++ b/arch/powerpc/include/asm/word-at-a-time.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_WORD_AT_A_TIME_H #define _ASM_WORD_AT_A_TIME_H diff --git a/arch/powerpc/kernel/interrupt_64.S b/arch/powerpc/kernel/interrupt_64.S index 7bab2d7de372..d58629fef038 100644 --- a/arch/powerpc/kernel/interrupt_64.S +++ b/arch/powerpc/kernel/interrupt_64.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <asm/asm-offsets.h> #include <asm/bug.h> #ifdef CONFIG_PPC_BOOK3S diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 9f8d0fa7b718..75b925e1f2b6 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PowerPC backend to the KGDB stub. * @@ -8,10 +9,6 @@ * PPC32 support restored by Vitaly Wool <vwool@ru.mvista.com> and * Sergei Shtylyov <sshtylyov@ru.mvista.com> * Copyright (C) 2007-2008 Wind River Systems, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program as licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/kernel.h> diff --git a/arch/powerpc/kernel/ptrace/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c index c43f77e2ac31..cb690dcb86dd 100644 --- a/arch/powerpc/kernel/ptrace/ptrace.c +++ b/arch/powerpc/kernel/ptrace/ptrace.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PowerPC version * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) @@ -9,10 +10,6 @@ * * Modified by Cort Dougan (cort@hq.fsmlabs.com) * and Paul Mackerras (paulus@samba.org). - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file README.legal in the main directory of - * this archive for more details. */ #include <linux/regset.h> diff --git a/arch/powerpc/kernel/ptrace/ptrace32.c b/arch/powerpc/kernel/ptrace/ptrace32.c index 19c224808982..ff1d780ed4fe 100644 --- a/arch/powerpc/kernel/ptrace/ptrace32.c +++ b/arch/powerpc/kernel/ptrace/ptrace32.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ptrace for 32-bit processes running on a 64-bit kernel. * @@ -11,10 +12,6 @@ * * Modified by Cort Dougan (cort@hq.fsmlabs.com) * and Paul Mackerras (paulus@samba.org). - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file COPYING in the main directory of - * this archive for more details. */ #include <linux/ptrace.h> diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c index b93b87df499d..2affb8940f6a 100644 --- a/arch/powerpc/kernel/signal.c +++ b/arch/powerpc/kernel/signal.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Common signal handling code for both 32 and 64 bits * * Copyright (c) 2007 Benjamin Herrenschmidt, IBM Corporation * Extracted from signal_32.c and signal_64.c - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file README.legal in the main directory of - * this archive for more details. */ #include <linux/tracehook.h> diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h index 618aeccdf691..2006a07fe771 100644 --- a/arch/powerpc/kernel/signal.h +++ b/arch/powerpc/kernel/signal.h @@ -1,10 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2007 Benjamin Herrenschmidt, IBM Corporation * Extracted from signal_32.c and signal_64.c - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file README.legal in the main directory of - * this archive for more details. */ #ifndef _POWERPC_ARCH_SIGNAL_H diff --git a/arch/powerpc/kernel/vdso32/note.S b/arch/powerpc/kernel/vdso32/note.S index 227a7327399e..1698e72d4cbf 100644 --- a/arch/powerpc/kernel/vdso32/note.S +++ b/arch/powerpc/kernel/vdso32/note.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. * Here we can supply some information useful to userland. diff --git a/arch/powerpc/kernel/vdso64/note.S b/arch/powerpc/kernel/vdso64/note.S index dc2a509f7e8a..bd1fa23597d6 100644 --- a/arch/powerpc/kernel/vdso64/note.S +++ b/arch/powerpc/kernel/vdso64/note.S @@ -1 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include "../vdso32/note.S" diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index 23e9c2bd9f27..fe956ae6ed10 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -1,26 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * OpenPIC emulation * * Copyright (c) 2004 Jocelyn Mayer * 2011 Alexander Graf - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include <linux/slab.h> diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S index 7e5e1c28e56a..075ce35226de 100644 --- a/arch/powerpc/lib/crtsavres.S +++ b/arch/powerpc/lib/crtsavres.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Special support for eabi and SVR4 * @@ -8,11 +9,6 @@ * Based on gcc/config/rs6000/crtsavres.asm from gcc * 64 bit additions from reading the PPC elf64abi document. * - * This file 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, or (at your option) any - * later version. - * * In addition to the permissions in the GNU General Public License, the * Free Software Foundation gives you unlimited permission to link the * compiled version of this file with other programs, and to distribute @@ -21,16 +17,6 @@ * respects; for example, they cover modification of the file, and * distribution when not linked into another program.) * - * This file 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; see the file COPYING. If not, write to - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * * As a special exception, if you link this library with files * compiled with GCC to produce an executable, this does not cause * the resulting executable to be covered by the GNU General Public License. diff --git a/arch/powerpc/lib/restart_table.c b/arch/powerpc/lib/restart_table.c index bccb662c1b7b..aaf89522d23e 100644 --- a/arch/powerpc/lib/restart_table.c +++ b/arch/powerpc/lib/restart_table.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <asm/interrupt.h> #include <asm/kprobes.h> diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c index 6aa774aa5b16..5c1ae0a89284 100644 --- a/arch/powerpc/lib/rheap.c +++ b/arch/powerpc/lib/rheap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * A Remote Heap. Remote means that we don't touch the memory that the * heap points to. Normal heap implementations use the memory they manage @@ -7,10 +8,7 @@ * * Author: Pantelis Antoniou <panto@intracom.gr> * - * 2004 (c) INTRACOM S.A. Greece. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2004 (c) INTRACOM S.A. Greece. */ #include <linux/types.h> #include <linux/errno.h> diff --git a/arch/powerpc/mm/book3s64/hash_4k.c b/arch/powerpc/mm/book3s64/hash_4k.c index 7de1a8a0c62a..4e18a09977dd 100644 --- a/arch/powerpc/mm/book3s64/hash_4k.c +++ b/arch/powerpc/mm/book3s64/hash_4k.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: LGPL-2.0 /* * Copyright IBM Corporation, 2015 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU Lesser General Public License - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * */ #include <linux/mm.h> diff --git a/arch/powerpc/mm/book3s64/hash_64k.c b/arch/powerpc/mm/book3s64/hash_64k.c index 998c6817ed47..90d1a3eff32c 100644 --- a/arch/powerpc/mm/book3s64/hash_64k.c +++ b/arch/powerpc/mm/book3s64/hash_64k.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: LGPL-2.0 /* * Copyright IBM Corporation, 2015 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU Lesser General Public License - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * */ #include <linux/mm.h> diff --git a/arch/powerpc/mm/book3s64/hash_hugepage.c b/arch/powerpc/mm/book3s64/hash_hugepage.c index c0fabe6c5a12..158c51f520fc 100644 --- a/arch/powerpc/mm/book3s64/hash_hugepage.c +++ b/arch/powerpc/mm/book3s64/hash_hugepage.c @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: LGPL-2.1 /* * Copyright IBM Corporation, 2013 * Author Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2.1 of the GNU Lesser General Public License - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * */ /* diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index ddead41e2194..5cdd7a587e09 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PPC Huge TLB Page Support for Kernel. * diff --git a/arch/powerpc/perf/req-gen/_end.h b/arch/powerpc/perf/req-gen/_end.h index 8a406980b6bf..6687fccd3752 100644 --- a/arch/powerpc/perf/req-gen/_end.h +++ b/arch/powerpc/perf/req-gen/_end.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef REQ_GEN_PREFIX #undef REQUEST_BEGIN diff --git a/arch/powerpc/platforms/44x/fsp2.h b/arch/powerpc/platforms/44x/fsp2.h index 9e1d52754c8b..ae637bf2b58b 100644 --- a/arch/powerpc/platforms/44x/fsp2.h +++ b/arch/powerpc/platforms/44x/fsp2.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_POWERPC_FSP_DCR_H_ #define _ASM_POWERPC_FSP_DCR_H_ #ifdef __KERNEL__ diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/pci.c index 24f41e178cbc..1dabc65d5b3e 100644 --- a/arch/powerpc/platforms/4xx/pci.c +++ b/arch/powerpc/platforms/4xx/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCI / PCI-X / PCI-Express support for 4xx parts * diff --git a/arch/powerpc/platforms/4xx/pci.h b/arch/powerpc/platforms/4xx/pci.h index bb4821938ab1..364838cc90ff 100644 --- a/arch/powerpc/platforms/4xx/pci.h +++ b/arch/powerpc/platforms/4xx/pci.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * PCI / PCI-X / PCI-Express support for 4xx parts * diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 3b7d70d71692..34aea2bbc5ec 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Efika 5K2 platform code * Some code really inspired from the lite5200b platform. * * Copyright (C) 2006 bplan GmbH - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/init.h> diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c index 565e3a83dc9e..bd6831fc2199 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * * Utility functions for the Freescale MPC52xx. * * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - * */ #undef DEBUG diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index af0f79995214..750167a984ec 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * PCI code for the Freescale MPC52xx embedded CPU. * * Copyright (C) 2006 Secret Lab Technologies Ltd. * Grant Likely <grant.likely@secretlab.ca> * Copyright (C) 2004 Sylvain Munaut <tnt@246tNt.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #undef DEBUG diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c index 76a8102bdb98..bd8add92c4ae 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * * Programmable Interrupt Controller functions for the Freescale MPC52xx. @@ -9,11 +10,6 @@ * * Based on the code from the 2.4 kernel by * Dale Farnsworth <dfarnsworth@mvista.com> and Kent Borg. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - * */ /* diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c index 6ef8580fdc0e..638ae5e9a1eb 100644 --- a/arch/powerpc/platforms/85xx/ksi8560.c +++ b/arch/powerpc/platforms/85xx/ksi8560.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Board setup routines for the Emerson KSI8560 * @@ -5,10 +6,7 @@ * * Based on mpc85xx_ads.c maintained by Kumar Gala * - * 2008 (c) MontaVista, Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2008 (c) MontaVista, Software, Inc. * */ diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c index 1f1af0557470..24d9518668cd 100644 --- a/arch/powerpc/platforms/85xx/p1022_ds.c +++ b/arch/powerpc/platforms/85xx/p1022_ds.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * P1022DS board specific routines * @@ -10,10 +11,6 @@ * This file is taken from the Freescale P1022DS BSP, with modifications: * 2) No AMP support * 3) No PCI endpoint support - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/fsl/guts.h> diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c index fd9e3e7ef234..69a4384d8fd3 100644 --- a/arch/powerpc/platforms/85xx/p1022_rdk.c +++ b/arch/powerpc/platforms/85xx/p1022_rdk.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * P1022 RDK board specific routines * @@ -6,10 +7,6 @@ * Author: Timur Tabi <timur@freescale.com> * * Based on p1022_ds.c - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/fsl/guts.h> diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c index ebcf34a14789..f08b76c7cd17 100644 --- a/arch/powerpc/platforms/8xx/ep88xc.c +++ b/arch/powerpc/platforms/8xx/ep88xc.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Platform setup for the Embedded Planet EP88xC board * * Author: Scott Wood <scottwood@freescale.com> * Copyright 2007 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/init.h> diff --git a/arch/powerpc/platforms/8xx/mpc86xads.h b/arch/powerpc/platforms/8xx/mpc86xads.h index 17b1fe75e0b2..ebfe27d62486 100644 --- a/arch/powerpc/platforms/8xx/mpc86xads.h +++ b/arch/powerpc/platforms/8xx/mpc86xads.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * A collection of structures, addresses, and values associated with * the Freescale MPC86xADS board. @@ -6,9 +7,7 @@ * Author: MontaVista Software, Inc. * source@mvista.com * - * 2005 (c) MontaVista Software, Inc. This file is licensed under the - * terms of the GNU General Public License version 2. This program is licensed - * "as is" without any warranty of any kind, whether express or implied. + * 2005 (c) MontaVista Software, Inc. */ #ifdef __KERNEL__ diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c index 8d02f5ff4481..73ac5e9b52a1 100644 --- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /*arch/powerpc/platforms/8xx/mpc86xads_setup.c * * Platform setup for the Freescale mpc86xads board @@ -8,10 +9,6 @@ * * Heavily modified by Scott Wood <scottwood@freescale.com> * Copyright 2007 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/init.h> diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h index 19412f76fa3b..d9f038015b97 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads.h +++ b/arch/powerpc/platforms/8xx/mpc885ads.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * A collection of structures, addresses, and values associated with * the Freescale MPC885ADS board. @@ -6,9 +7,7 @@ * Author: MontaVista Software, Inc. * source@mvista.com * - * 2005 (c) MontaVista Software, Inc. This file is licensed under the - * terms of the GNU General Public License version 2. This program is licensed - * "as is" without any warranty of any kind, whether express or implied. + * 2005 (c) MontaVista Software, Inc. */ #ifdef __KERNEL__ diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c index a0c83c1905c6..74919d491f36 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Platform setup for the Freescale mpc885ads board * @@ -7,10 +8,6 @@ * * Heavily modified by Scott Wood <scottwood@freescale.com> * Copyright 2007 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/init.h> diff --git a/arch/powerpc/platforms/8xx/mpc8xx.h b/arch/powerpc/platforms/8xx/mpc8xx.h index 31cc2ecace42..3a39e1ad73da 100644 --- a/arch/powerpc/platforms/8xx/mpc8xx.h +++ b/arch/powerpc/platforms/8xx/mpc8xx.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Prototypes, etc. for the Freescale MPC8xx embedded cpu chips * May need to be cleaned as the port goes on ... * * Copyright (C) 2008 Jochen Friedrich <jochen@scram.de> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #ifndef __MPC8xx_H #define __MPC8xx_H diff --git a/arch/powerpc/platforms/8xx/pic.c b/arch/powerpc/platforms/8xx/pic.c index f2ba837249d6..4130cea17239 100644 --- a/arch/powerpc/platforms/8xx/pic.c +++ b/arch/powerpc/platforms/8xx/pic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/kernel.h> #include <linux/stddef.h> #include <linux/sched.h> diff --git a/arch/powerpc/platforms/8xx/pic.h b/arch/powerpc/platforms/8xx/pic.h index 9fe00eebdc8b..45ec3966a2ce 100644 --- a/arch/powerpc/platforms/8xx/pic.h +++ b/arch/powerpc/platforms/8xx/pic.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _PPC_KERNEL_MPC8xx_H #define _PPC_KERNEL_MPC8xx_H diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c index 4cea8b1afa44..a7839f5be195 100644 --- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c +++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Platform setup for the MPC8xx based boards from TQM. * @@ -11,10 +12,6 @@ * * Heavily modified by Scott Wood <scottwood@freescale.com> * Copyright 2007 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/init.h> diff --git a/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped b/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped index f383b027e8bf..f997a8c9edd2 100644 --- a/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped +++ b/arch/powerpc/platforms/cell/spufs/spu_restore_dump.h_shipped @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * spu_restore_dump.h: Copyright (C) 2005 IBM. * Hex-dump auto generated from spu_restore.c. diff --git a/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped b/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped index b9f81ac8a632..f85f798e270e 100644 --- a/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped +++ b/arch/powerpc/platforms/cell/spufs/spu_save_dump.h_shipped @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * spu_save_dump.h: Copyright (C) 2005 IBM. * Hex-dump auto generated from spu_save.c. diff --git a/arch/powerpc/platforms/chrp/gg2.h b/arch/powerpc/platforms/chrp/gg2.h index 341ae55b99fb..0af19e866bc3 100644 --- a/arch/powerpc/platforms/chrp/gg2.h +++ b/arch/powerpc/platforms/chrp/gg2.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * include/asm-ppc/gg2.h -- VLSI VAS96011/12 `Golden Gate 2' register definitions * @@ -7,10 +8,6 @@ * * The VAS96011/12 Chipset, Data Book, Edition 1.0 * VLSI Technology, Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. */ #ifndef _ASMPPC_GG2_H diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index eb8342e7f84e..f8470d301f0b 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Board setup routines for the Buffalo Linkstation / Kurobox Platform. * * Copyright (C) 2006 G. Liakhovetski (g.liakhovetski@gmx.de) * * Based on sandpoint.c by Mark A. Greer - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of - * any kind, whether express or implied. */ #include <linux/kernel.h> diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c index 9d891bd5df5a..7ce62fe5847f 100644 --- a/arch/powerpc/platforms/embedded6xx/ls_uart.c +++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AVR power-management chip interface for the Buffalo Linkstation / * Kurobox Platform. * * Author: 2006 (c) G. Liakhovetski * g.liakhovetski@gmx.de - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of - * any kind, whether express or implied. */ #include <linux/workqueue.h> #include <linux/string.h> diff --git a/arch/powerpc/platforms/embedded6xx/mpc10x.h b/arch/powerpc/platforms/embedded6xx/mpc10x.h index 5ad12023e562..0f36f5252a5c 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc10x.h +++ b/arch/powerpc/platforms/embedded6xx/mpc10x.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Common routines for the Motorola SPS MPC106/8240/107 Host bridge/Mem * ctlr/EPIC/etc. @@ -5,10 +6,7 @@ * Author: Mark A. Greer * mgreer@mvista.com * - * 2001 (c) MontaVista, Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2001 (c) MontaVista, Software, Inc. */ #ifndef __PPC_KERNEL_MPC10X_H #define __PPC_KERNEL_MPC10X_H diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c index e188b90f7016..aa19ad11d52c 100644 --- a/arch/powerpc/platforms/embedded6xx/storcenter.c +++ b/arch/powerpc/platforms/embedded6xx/storcenter.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Board setup routines for the storcenter * @@ -5,10 +6,6 @@ * Copyright 2007 Andy Wilcox, Jon Loeliger * * Based on linkstation.c by G. Liakhovetski - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of - * any kind, whether express or implied. */ #include <linux/kernel.h> diff --git a/arch/powerpc/platforms/microwatt/Makefile b/arch/powerpc/platforms/microwatt/Makefile index 116d6d3ad3f0..7defeadac694 100644 --- a/arch/powerpc/platforms/microwatt/Makefile +++ b/arch/powerpc/platforms/microwatt/Makefile @@ -1 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 obj-y += setup.o rng.o diff --git a/arch/powerpc/platforms/microwatt/setup.c b/arch/powerpc/platforms/microwatt/setup.c index 0b02603bdb74..fe6c242f788f 100644 --- a/arch/powerpc/platforms/microwatt/setup.c +++ b/arch/powerpc/platforms/microwatt/setup.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Microwatt FPGA-based SoC platform setup code. * diff --git a/arch/powerpc/platforms/pseries/ibmebus.c b/arch/powerpc/platforms/pseries/ibmebus.c index 7ee3ed7d6cc2..8d0521a13892 100644 --- a/arch/powerpc/platforms/pseries/ibmebus.c +++ b/arch/powerpc/platforms/pseries/ibmebus.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD /* * IBM PowerPC IBM eBus Infrastructure Support. * @@ -6,34 +7,6 @@ * Heiko J Schick <schickhj@de.ibm.com> * * All rights reserved. - * - * This source code is distributed under a dual license of GPL v2.0 and OpenIB - * BSD. - * - * OpenIB BSD License - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. */ #include <linux/init.h> diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c index 3f130312b6e9..f3083b231976 100644 --- a/arch/powerpc/sysdev/cpm2.c +++ b/arch/powerpc/sysdev/cpm2.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * General Purpose functions for the global management of the * 8260 Communication Processor Module. @@ -8,10 +9,6 @@ * 2006 (c) MontaVista Software, Inc. * Vitaly Bordug <vbordug@ru.mvista.com> * Merged to arch/powerpc from arch/ppc/syslib/cpm2_common.c - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ /* diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 9e86074719a9..4a07b266ed4f 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Platform information definitions. * @@ -8,10 +9,6 @@ * * 1999-2001 (c) Dan Malek <dan@embeddedalley.com> * 2006 (c) MontaVista Software, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ /* The CPM2 internal interrupt controller. It is usually diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c index 00705258ecf9..7cd2bca189bf 100644 --- a/arch/powerpc/sysdev/ehv_pic.c +++ b/arch/powerpc/sysdev/ehv_pic.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for ePAPR Embedded Hypervisor PIC * * Copyright 2008-2011 Freescale Semiconductor, Inc. * * Author: Ashish Kalra <ashish.kalra@freescale.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/types.h> diff --git a/arch/powerpc/sysdev/ge/ge_pic.c b/arch/powerpc/sysdev/ge/ge_pic.c index 02553a8ce191..3ecaa319c53f 100644 --- a/arch/powerpc/sysdev/ge/ge_pic.c +++ b/arch/powerpc/sysdev/ge/ge_pic.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Interrupt handling for GE FPGA based PIC * * Author: Martyn Welch <martyn.welch@ge.com> * * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. */ #include <linux/stddef.h> diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index d5cb48b61bbd..23514f449381 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/powerpc/kernel/mpic.c * @@ -7,10 +8,6 @@ * * Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp. * Copyright 2010-2012 Freescale Semiconductor, Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. */ #undef DEBUG diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c index af0f9beddca9..1d9d072d1038 100644 --- a/arch/powerpc/sysdev/rtc_cmos_setup.c +++ b/arch/powerpc/sysdev/rtc_cmos_setup.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Setup code for PC-style Real-Time Clock. * * Author: Wade Farnsworth <wfarnsworth@mvista.com> * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * 2007 (c) MontaVista Software, Inc. */ #include <linux/platform_device.h> diff --git a/arch/powerpc/tools/ci-build.sh b/arch/powerpc/tools/ci-build.sh index 420df6ec5a2f..a861fd722495 100755 --- a/arch/powerpc/tools/ci-build.sh +++ b/arch/powerpc/tools/ci-build.sh @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 if [[ -z "$TARGET" || -z "$IMAGE" ]]; then echo "Error: required environment variables not set!" diff --git a/arch/powerpc/tools/head_check.sh b/arch/powerpc/tools/head_check.sh index 689907cda996..ee4e8cbb3747 100644 --- a/arch/powerpc/tools/head_check.sh +++ b/arch/powerpc/tools/head_check.sh @@ -1,10 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright © 2016 IBM 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 script checks the head of a vmlinux for linker stubs that # break our placement of fixed-location code for 64-bit. diff --git a/arch/powerpc/xmon/ppc.h b/arch/powerpc/xmon/ppc.h index d00f33dcf192..b464578397a0 100644 --- a/arch/powerpc/xmon/ppc.h +++ b/arch/powerpc/xmon/ppc.h @@ -1,22 +1,11 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ /* ppc.h -- Header file for PowerPC opcode table Copyright (C) 1994-2016 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support This file is part of GDB, GAS, and the GNU binutils. -GDB, GAS, and the GNU binutils are free software; you can redistribute -them and/or modify them under the terms of the GNU General Public -License as published by the Free Software Foundation; either version -1, or (at your option) any later version. - -GDB, GAS, and the GNU binutils are distributed in the hope that they -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 file; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + */ #ifndef PPC_H #define PPC_H
Several files are missing SPDX license identifiers. Following files are given the following SPDX identifier based on the comments in the top of the file: boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */ include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD */ include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */ kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0 lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */ mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0 mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0 mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1 platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+ xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */ Add to other files the default kernel license identifier, in extenso GPL-2.0. DTS files are handled in a separate commit. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-spdx@vger.kernel.org --- v3: Removed license text and license note in the files that have any. v2: Changed from GPL-2.0 to a licence consistant with the file's comments for the few files listed in the commit message. --- arch/powerpc/Makefile | 5 +-- arch/powerpc/boot/44x.h | 5 +-- arch/powerpc/boot/4xx.h | 5 +-- arch/powerpc/boot/crtsavres.S | 16 +--------- arch/powerpc/boot/dummy.c | 1 + arch/powerpc/boot/install.sh | 5 +-- arch/powerpc/boot/ops.h | 6 ++-- arch/powerpc/boot/serial.c | 6 ++-- arch/powerpc/boot/simple_alloc.c | 6 ++-- arch/powerpc/include/asm/8xx_immap.h | 1 + arch/powerpc/include/asm/asm-compat.h | 1 + arch/powerpc/include/asm/asm-const.h | 1 + arch/powerpc/include/asm/asm-offsets.h | 1 + arch/powerpc/include/asm/cpm.h | 1 + arch/powerpc/include/asm/dtl.h | 1 + arch/powerpc/include/asm/edac.h | 6 ++-- arch/powerpc/include/asm/ehv_pic.h | 5 +-- arch/powerpc/include/asm/emergency-restart.h | 1 + arch/powerpc/include/asm/epapr_hcalls.h | 32 +------------------ arch/powerpc/include/asm/fixmap.h | 5 +-- arch/powerpc/include/asm/floppy.h | 5 +-- arch/powerpc/include/asm/fs_pd.h | 5 +-- arch/powerpc/include/asm/fsl_hcalls.h | 32 +------------------ arch/powerpc/include/asm/hydra.h | 5 +-- arch/powerpc/include/asm/ibmebus.h | 29 +---------------- arch/powerpc/include/asm/kgdb.h | 6 ++-- arch/powerpc/include/asm/membarrier.h | 1 + arch/powerpc/include/asm/module.lds.h | 1 + arch/powerpc/include/asm/mpc52xx.h | 5 +-- arch/powerpc/include/asm/mpc52xx_psc.h | 5 +-- arch/powerpc/include/asm/pmac_feature.h | 5 +-- arch/powerpc/include/asm/ppc_asm.h | 1 + arch/powerpc/include/asm/pte-walk.h | 1 + arch/powerpc/include/asm/rheap.h | 6 ++-- arch/powerpc/include/asm/sfp-machine.h | 16 +--------- arch/powerpc/include/asm/vmalloc.h | 1 + arch/powerpc/include/asm/word-at-a-time.h | 1 + arch/powerpc/kernel/interrupt_64.S | 1 + arch/powerpc/kernel/kgdb.c | 5 +-- arch/powerpc/kernel/ptrace/ptrace.c | 5 +-- arch/powerpc/kernel/ptrace/ptrace32.c | 5 +-- arch/powerpc/kernel/signal.c | 5 +-- arch/powerpc/kernel/signal.h | 5 +-- arch/powerpc/kernel/vdso32/note.S | 1 + arch/powerpc/kernel/vdso64/note.S | 1 + arch/powerpc/kvm/mpic.c | 19 +---------- arch/powerpc/lib/crtsavres.S | 16 +--------- arch/powerpc/lib/restart_table.c | 1 + arch/powerpc/lib/rheap.c | 6 ++-- arch/powerpc/mm/book3s64/hash_4k.c | 10 +----- arch/powerpc/mm/book3s64/hash_64k.c | 10 +----- arch/powerpc/mm/book3s64/hash_hugepage.c | 10 +----- arch/powerpc/mm/hugetlbpage.c | 1 + arch/powerpc/perf/req-gen/_end.h | 1 + arch/powerpc/platforms/44x/fsp2.h | 1 + arch/powerpc/platforms/4xx/pci.c | 1 + arch/powerpc/platforms/4xx/pci.h | 1 + arch/powerpc/platforms/52xx/efika.c | 5 +-- arch/powerpc/platforms/52xx/mpc52xx_common.c | 6 +--- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +-- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 6 +--- arch/powerpc/platforms/85xx/ksi8560.c | 6 ++-- arch/powerpc/platforms/85xx/p1022_ds.c | 5 +-- arch/powerpc/platforms/85xx/p1022_rdk.c | 5 +-- arch/powerpc/platforms/8xx/ep88xc.c | 5 +-- arch/powerpc/platforms/8xx/mpc86xads.h | 5 ++- arch/powerpc/platforms/8xx/mpc86xads_setup.c | 5 +-- arch/powerpc/platforms/8xx/mpc885ads.h | 5 ++- arch/powerpc/platforms/8xx/mpc885ads_setup.c | 5 +-- arch/powerpc/platforms/8xx/mpc8xx.h | 5 +-- arch/powerpc/platforms/8xx/pic.c | 1 + arch/powerpc/platforms/8xx/pic.h | 1 + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 5 +-- .../cell/spufs/spu_restore_dump.h_shipped | 1 + .../cell/spufs/spu_save_dump.h_shipped | 1 + arch/powerpc/platforms/chrp/gg2.h | 5 +-- .../platforms/embedded6xx/linkstation.c | 5 +-- arch/powerpc/platforms/embedded6xx/ls_uart.c | 5 +-- arch/powerpc/platforms/embedded6xx/mpc10x.h | 6 ++-- .../platforms/embedded6xx/storcenter.c | 5 +-- arch/powerpc/platforms/microwatt/Makefile | 1 + arch/powerpc/platforms/microwatt/setup.c | 1 + arch/powerpc/platforms/pseries/ibmebus.c | 29 +---------------- arch/powerpc/sysdev/cpm2.c | 5 +-- arch/powerpc/sysdev/cpm2_pic.c | 5 +-- arch/powerpc/sysdev/ehv_pic.c | 5 +-- arch/powerpc/sysdev/ge/ge_pic.c | 5 +-- arch/powerpc/sysdev/mpic.c | 5 +-- arch/powerpc/sysdev/rtc_cmos_setup.c | 6 ++-- arch/powerpc/tools/ci-build.sh | 1 + arch/powerpc/tools/head_check.sh | 6 +--- arch/powerpc/xmon/ppc.h | 15 ++------- 92 files changed, 105 insertions(+), 422 deletions(-)