Someone recently pointed out to me the following wording on some of the
m68k files that reads:
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
This shows up in the following files:
arch/m68k/fpsp040/bindec.S
arch/m68k/fpsp040/binstr.S
arch/m68k/fpsp040/bugfix.S
arch/m68k/fpsp040/decbin.S
arch/m68k/fpsp040/do_func.S
arch/m68k/fpsp040/fpsp.h
arch/m68k/fpsp040/gen_except.S
arch/m68k/fpsp040/get_op.S
arch/m68k/fpsp040/kernel_ex.S
and seems to predate the bitkeeper tree, so it's a bit hard to figure
out where they came from.
Any ideas of how they made it into our tree? And any chance of
correcting them to be the correct license or removing them?
thanks,
greg k-h
On Thu, Jan 19, 2006 at 10:09:47AM -0800, Greg KH wrote:
> Any ideas of how they made it into our tree? And any chance of
> correcting them to be the correct license or removing them?
This is pretty old stuff. The files in arch/m68k/fpsp040/
implement all the extra 68881/68882 instructions that they
left out of the FPU that is builtin on the 68040. This is
the official Motorola provided implementation of them, and
they seem to be widely available. I have no idea on the
license issues, however. One thing to note is that there is
a README file in that directory that appears to be part of
the original distribution of this code from Motorola with
some license info.
Brad Boyer
[email protected]
Hi,
On Thu, 19 Jan 2006, Greg KH wrote:
> Someone recently pointed out to me the following wording on some of the
> m68k files that reads:
>
> | Copyright (C) Motorola, Inc. 1990
> | All Rights Reserved
> |
> | THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
> | The copyright notice above does not evidence any
> | actual or intended publication of such source code.
It has been published like this from Motorola and still is available at
http://www.freescale.com/files/32bit/software/app_software/code_examples/MC68040FPSP.html
> Any ideas of how they made it into our tree? And any chance of
> correcting them to be the correct license or removing them?
The above is only a copyright notice, does this already constitute a
license?
The actual license is in the README file.
bye, Roman
On Iau, 2006-01-19 at 10:09 -0800, Greg KH wrote:
> Someone recently pointed out to me the following wording on some of the
> m68k files that reads:
>
> | Copyright (C) Motorola, Inc. 1990
> | All Rights Reserved
> |
You'll need to dig back through the archives but this was discussed and
resolved when the M68K merge was done or shortly afterwards. There is no
obvious problem with the licenses either. I believe Jes Sorensen did the
merge in question.
README
| You are hereby granted a copyright license to use, modify, and
| distribute the SOFTWARE so long as this entire notice is retained
| without alteration in any modified and/or redistributed versions,
| and that such modified versions are clearly identified as such.
| No licenses are granted by implication, estoppel or otherwise
| under any patents or trademarks of Motorola, Inc.
All Rights Reserved is not a problem since there is a license with it
"Not evidence blah" is not a problem because we have permission to
redistribute it.
On Thu, Jan 19, 2006 at 09:14:09PM +0100, Roman Zippel wrote:
> Hi,
>
> On Thu, 19 Jan 2006, Greg KH wrote:
>
> > Someone recently pointed out to me the following wording on some of the
> > m68k files that reads:
> >
> > | Copyright (C) Motorola, Inc. 1990
> > | All Rights Reserved
> > |
> > | THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
> > | The copyright notice above does not evidence any
> > | actual or intended publication of such source code.
>
> It has been published like this from Motorola and still is available at
> http://www.freescale.com/files/32bit/software/app_software/code_examples/MC68040FPSP.html
>
> > Any ideas of how they made it into our tree? And any chance of
> > correcting them to be the correct license or removing them?
>
> The above is only a copyright notice, does this already constitute a
> license?
No, it doesn't, but the UNPUBLISHED portion sure makes people wonder
about it.
> The actual license is in the README file.
Ah, ok, thanks, that makes sense. How about a simple pointer to the
license info from the .S files to the README file so that people (like
me), don't get confused again? I've attached a patch below if you wish
to apply it.
thanks,
greg k-h
-------------
From: Greg Kroah-Hartman <[email protected]>
Subject: [PATCH] Add wording to m68k .S files to help clairfy license info.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
arch/m68k/fpsp040/bindec.S | 3 +++
arch/m68k/fpsp040/binstr.S | 3 +++
arch/m68k/fpsp040/bugfix.S | 3 +++
arch/m68k/fpsp040/decbin.S | 3 +++
arch/m68k/fpsp040/do_func.S | 3 +++
arch/m68k/fpsp040/gen_except.S | 3 +++
arch/m68k/fpsp040/get_op.S | 3 +++
arch/m68k/fpsp040/kernel_ex.S | 3 +++
arch/m68k/fpsp040/res_func.S | 3 +++
arch/m68k/fpsp040/round.S | 3 +++
arch/m68k/fpsp040/sacos.S | 3 +++
arch/m68k/fpsp040/sasin.S | 3 +++
arch/m68k/fpsp040/satan.S | 3 +++
arch/m68k/fpsp040/satanh.S | 3 +++
arch/m68k/fpsp040/scale.S | 3 +++
arch/m68k/fpsp040/scosh.S | 3 +++
arch/m68k/fpsp040/setox.S | 3 +++
arch/m68k/fpsp040/sgetem.S | 3 +++
arch/m68k/fpsp040/sint.S | 3 +++
arch/m68k/fpsp040/skeleton.S | 3 +++
arch/m68k/fpsp040/slog2.S | 3 +++
arch/m68k/fpsp040/slogn.S | 3 +++
arch/m68k/fpsp040/smovecr.S | 3 +++
arch/m68k/fpsp040/srem_mod.S | 3 +++
arch/m68k/fpsp040/ssin.S | 3 +++
arch/m68k/fpsp040/ssinh.S | 3 +++
arch/m68k/fpsp040/stan.S | 3 +++
arch/m68k/fpsp040/stanh.S | 3 +++
arch/m68k/fpsp040/sto_res.S | 3 +++
arch/m68k/fpsp040/stwotox.S | 3 +++
arch/m68k/fpsp040/tbldo.S | 3 +++
arch/m68k/fpsp040/util.S | 3 +++
arch/m68k/fpsp040/x_bsun.S | 3 +++
arch/m68k/fpsp040/x_fline.S | 3 +++
arch/m68k/fpsp040/x_operr.S | 3 +++
arch/m68k/fpsp040/x_ovfl.S | 3 +++
arch/m68k/fpsp040/x_snan.S | 3 +++
arch/m68k/fpsp040/x_store.S | 3 +++
arch/m68k/fpsp040/x_unfl.S | 3 +++
arch/m68k/fpsp040/x_unimp.S | 3 +++
arch/m68k/fpsp040/x_unsupp.S | 3 +++
41 files changed, 123 insertions(+)
--- gregkh-2.6.orig/arch/m68k/fpsp040/bindec.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/bindec.S 2006-01-19 13:59:58.000000000 -0800
@@ -134,6 +134,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BINDEC idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/binstr.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/binstr.S 2006-01-19 13:59:47.000000000 -0800
@@ -63,6 +63,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BINSTR idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/bugfix.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/bugfix.S 2006-01-19 13:59:55.000000000 -0800
@@ -155,6 +155,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BUGFIX idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/decbin.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/decbin.S 2006-01-19 14:00:06.000000000 -0800
@@ -72,6 +72,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|DECBIN idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/do_func.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/do_func.S 2006-01-19 14:00:11.000000000 -0800
@@ -25,6 +25,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
DO_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/gen_except.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/gen_except.S 2006-01-19 14:00:17.000000000 -0800
@@ -32,6 +32,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
GEN_EXCEPT: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/get_op.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/get_op.S 2006-01-19 14:00:21.000000000 -0800
@@ -57,6 +57,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
GET_OP: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/kernel_ex.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/kernel_ex.S 2006-01-19 14:00:25.000000000 -0800
@@ -15,6 +15,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
KERNEL_EX: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/res_func.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/res_func.S 2006-01-19 14:00:29.000000000 -0800
@@ -19,6 +19,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
RES_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/round.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/round.S 2006-01-19 14:00:34.000000000 -0800
@@ -11,6 +11,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|ROUND idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/sacos.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/sacos.S 2006-01-19 14:00:38.000000000 -0800
@@ -41,6 +41,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SACOS idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/sasin.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/sasin.S 2006-01-19 14:00:43.000000000 -0800
@@ -41,6 +41,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SASIN idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/satan.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/satan.S 2006-01-19 14:00:48.000000000 -0800
@@ -46,6 +46,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|satan idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/satanh.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/satanh.S 2006-01-19 14:00:52.000000000 -0800
@@ -48,6 +48,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|satanh idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/scale.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/scale.S 2006-01-19 14:00:56.000000000 -0800
@@ -24,6 +24,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SCALE idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/scosh.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/scosh.S 2006-01-19 14:01:01.000000000 -0800
@@ -52,6 +52,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SCOSH idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/setox.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/setox.S 2006-01-19 14:01:05.000000000 -0800
@@ -334,6 +334,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|setox idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/sgetem.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/sgetem.S 2006-01-19 14:01:09.000000000 -0800
@@ -27,6 +27,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SGETEM idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/sint.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/sint.S 2006-01-19 14:01:13.000000000 -0800
@@ -54,6 +54,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SINT idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/skeleton.S 2006-01-17 08:25:48.000000000 -0800
+++ gregkh-2.6/arch/m68k/fpsp040/skeleton.S 2006-01-19 14:01:17.000000000 -0800
@@ -33,6 +33,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|
| Modified for Linux-1.3.x by Jes Sorensen ([email protected])
--- gregkh-2.6.orig/arch/m68k/fpsp040/slog2.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/slog2.S 2006-01-19 14:01:21.000000000 -0800
@@ -99,6 +99,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SLOG2 idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/slogn.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/slogn.S 2006-01-19 14:01:24.000000000 -0800
@@ -66,6 +66,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|slogn idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/smovecr.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/smovecr.S 2006-01-19 14:01:28.000000000 -0800
@@ -18,6 +18,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SMOVECR idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/srem_mod.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/srem_mod.S 2006-01-19 14:01:32.000000000 -0800
@@ -69,6 +69,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
SREM_MOD: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/ssin.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/ssin.S 2006-01-19 14:01:35.000000000 -0800
@@ -86,6 +86,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SSIN idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/ssinh.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/ssinh.S 2006-01-19 14:01:40.000000000 -0800
@@ -52,6 +52,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SSINH idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/stan.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/stan.S 2006-01-19 14:01:44.000000000 -0800
@@ -53,6 +53,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STAN idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/stanh.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/stanh.S 2006-01-19 14:01:49.000000000 -0800
@@ -52,6 +52,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STANH idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/sto_res.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/sto_res.S 2006-01-19 14:01:53.000000000 -0800
@@ -22,6 +22,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
STO_RES: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/stwotox.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/stwotox.S 2006-01-19 14:01:57.000000000 -0800
@@ -79,6 +79,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STWOTOX idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/tbldo.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/tbldo.S 2006-01-19 14:02:00.000000000 -0800
@@ -20,6 +20,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|TBLDO idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/util.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/util.S 2006-01-19 14:02:04.000000000 -0800
@@ -19,6 +19,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|UTIL idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_bsun.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_bsun.S 2006-01-19 14:02:07.000000000 -0800
@@ -16,6 +16,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_BSUN: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_fline.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_fline.S 2006-01-19 14:02:11.000000000 -0800
@@ -16,6 +16,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_FLINE: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_operr.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_operr.S 2006-01-19 14:02:15.000000000 -0800
@@ -46,6 +46,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_OPERR: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_ovfl.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_ovfl.S 2006-01-19 14:02:20.000000000 -0800
@@ -38,6 +38,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_OVFL: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_snan.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_snan.S 2006-01-19 14:02:23.000000000 -0800
@@ -25,6 +25,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_SNAN: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_store.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_store.S 2006-01-19 14:02:27.000000000 -0800
@@ -14,6 +14,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_STORE: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_unfl.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_unfl.S 2006-01-19 14:02:30.000000000 -0800
@@ -24,6 +24,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNFL: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_unimp.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_unimp.S 2006-01-19 14:02:33.000000000 -0800
@@ -25,6 +25,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNIMP: |idnt 2,1 | Motorola 040 Floating Point Software Package
--- gregkh-2.6.orig/arch/m68k/fpsp040/x_unsupp.S 2005-10-27 17:02:08.000000000 -0700
+++ gregkh-2.6/arch/m68k/fpsp040/x_unsupp.S 2006-01-19 14:02:38.000000000 -0800
@@ -26,6 +26,9 @@
| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
| The copyright notice above does not evidence any
| actual or intended publication of such source code.
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNSUPP: |idnt 2,1 | Motorola 040 Floating Point Software Package
On Iau, 2006-01-19 at 14:04 -0800, Greg KH wrote:
> Ah, ok, thanks, that makes sense. How about a simple pointer to the
> license info from the .S files to the README file so that people (like
> me), don't get confused again? I've attached a patch below if you wish
> to apply it.
>
They specifically ask as is their right within the GPL that you note if
you modify the files. Otherwise seems fine.
On Thu, Jan 19, 2006 at 10:14:56PM +0000, Alan Cox wrote:
> On Iau, 2006-01-19 at 14:04 -0800, Greg KH wrote:
> > Ah, ok, thanks, that makes sense. How about a simple pointer to the
> > license info from the .S files to the README file so that people (like
> > me), don't get confused again? I've attached a patch below if you wish
> > to apply it.
> >
> They specifically ask as is their right within the GPL that you note if
> you modify the files. Otherwise seems fine.
Hm, any idea on how to note that I modified the file in such a way that
would be acceptable? How about this?
+|
+| For details on the license for this file, please see the
+| file, README, in this same directory. Note, this paragraph in
+| this comment has been added from the original version of this
+| file from the author.
thanks,
greg k-h
>>>>> "Alan" == Alan Cox <[email protected]> writes:
Alan> On Iau, 2006-01-19 at 10:09 -0800, Greg KH wrote:
>> Someone recently pointed out to me the following wording on some of
>> the m68k files that reads:
>>
>> | Copyright (C) Motorola, Inc. 1990 | All Rights Reserved
Alan> You'll need to dig back through the archives but this was
Alan> discussed and resolved when the M68K merge was done or shortly
Alan> afterwards. There is no obvious problem with the licenses
Alan> either. I believe Jes Sorensen did the merge in question.
Actually, I think the fpsp040 stuff goes back way further than
that. To the days when Hamish was in charge.
Cheers,
Jes
On Fri, 20 Jan 2006, Jes Sorensen wrote:
> >>>>> "Alan" == Alan Cox <[email protected]> writes:
>
> Alan> On Iau, 2006-01-19 at 10:09 -0800, Greg KH wrote:
> >> Someone recently pointed out to me the following wording on some of
> >> the m68k files that reads:
> >>
> >> | Copyright (C) Motorola, Inc. 1990 | All Rights Reserved
>
> Alan> You'll need to dig back through the archives but this was
> Alan> discussed and resolved when the M68K merge was done or shortly
> Alan> afterwards. There is no obvious problem with the licenses
> Alan> either. I believe Jes Sorensen did the merge in question.
>
> Actually, I think the fpsp040 stuff goes back way further than
> that. To the days when Hamish was in charge.
Indeed. '040 support was added in early 1994. I still remember running
uncached on '040, yielding 1.5 BogoMIPS ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Greg KH wrote:
>On Thu, Jan 19, 2006 at 10:14:56PM +0000, Alan Cox wrote:
>
>
>>On Iau, 2006-01-19 at 14:04 -0800, Greg KH wrote:
>>
>>
>>>Ah, ok, thanks, that makes sense. How about a simple pointer to the
>>>license info from the .S files to the README file so that people (like
>>>me), don't get confused again? I've attached a patch below if you wish
>>>to apply it.
>>>
>>>
>>>
>>They specifically ask as is their right within the GPL that you note if
>>you modify the files. Otherwise seems fine.
>>
>>
>
>Hm, any idea on how to note that I modified the file in such a way that
>would be acceptable? How about this?
>
>+|
>+| For details on the license for this file, please see the
>+| file, README, in this same directory. Note, this paragraph in
>+| this comment has been added from the original version of this
>+| file from the author.
>
>thanks,
>
>greg k-h
>
>
The language in the source files is pretty strong and this looks like Motorola should be asked to rerelease the files with a normal copyright notice in place of the current language...
ric
On Gwe, 2006-01-20 at 07:21 -0500, Ric Wheeler wrote:
> The language in the source files is pretty strong and this looks like
> Motorola should be asked to rerelease the files with a normal
> copyright notice in place of the current language...
Its standard boilerplate from the period. Its a perfectly normal and
clear copyright notice.
Alan
Alan Cox wrote:
>On Gwe, 2006-01-20 at 07:21 -0500, Ric Wheeler wrote:
>
>
>>The language in the source files is pretty strong and this looks like
>>Motorola should be asked to rerelease the files with a normal
>>copyright notice in place of the current language...
>>
>>
>
>Its standard boilerplate from the period. Its a perfectly normal and
>clear copyright notice.
>
>Alan
>
>
Actually, that is the exact language our lawyers still give us to use
today when we have not settled on license terms when we want to share
code in a severely limited fashion.
I still think it best that they (Freescale) modify their language to
reference the actual license grant in the README.
ric
On Jan 20, 2006, at 7:45 AM, Ric Wheeler wrote:
> Alan Cox wrote:
>
>> On Gwe, 2006-01-20 at 07:21 -0500, Ric Wheeler wrote:
>>
>>> The language in the source files is pretty strong and this looks
>>> like
>>> Motorola should be asked to rerelease the files with a normal
>>> copyright notice in place of the current language...
>>>
>>
>> Its standard boilerplate from the period. Its a perfectly normal and
>> clear copyright notice.
>>
>> Alan
>>
> Actually, that is the exact language our lawyers still give us to
> use today when we have not settled on license terms when we want to
> share code in a severely limited fashion.
>
> I still think it best that they (Freescale) modify their language
> to reference the actual license grant in the README.
Good luck finding anyone in Freescale that would have any idea about
this.
- kumar
>> Alan Cox wrote:
>>
>>> On Gwe, 2006-01-20 at 07:21 -0500, Ric Wheeler wrote:
>>>
>>>> The language in the source files is pretty strong and this looks
>>>> like
>>>> Motorola should be asked to rerelease the files with a normal
>>>> copyright notice in place of the current language...
>>>>
>>>
>>> Its standard boilerplate from the period. Its a perfectly normal and
>>> clear copyright notice.
>>>
>>> Alan
>>>
>> Actually, that is the exact language our lawyers still give us to
>> use today when we have not settled on license terms when we want to
>> share code in a severely limited fashion.
>>
>> I still think it best that they (Freescale) modify their language
>> to reference the actual license grant in the README.
>
>Good luck finding anyone in Freescale that would have any idea about
>this.
>
>- kumar
>-
I have been given permission to fix the "UNPUBLISHED PROPRIETARY
SOURCE CODE OF MOTOROLA ..." section in the source files of fpsp040/
directory.
One suggestion, so we don't have to revisit this topic in 16 years
from now again, shouldn't we just remove the UNPUBLISHED ... comment
altogether and replace it with Greg Kroah-Hartman's suggested verbiage
as in the patch below?
--Matt
--------------------------------------------------------------------
Subject: Re: [PATCH] Add wording to m68k .S files to help clarify license info.
Signed-off-by: Matt Waddel <[email protected]>
diff --git a/arch/m68k/fpsp040/bindec.S b/arch/m68k/fpsp040/bindec.S
index 3ba446a..72f1159 100644
--- a/arch/m68k/fpsp040/bindec.S
+++ b/arch/m68k/fpsp040/bindec.S
@@ -131,9 +131,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BINDEC idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/binstr.S b/arch/m68k/fpsp040/binstr.S
index d53555c..8a05ba9 100644
--- a/arch/m68k/fpsp040/binstr.S
+++ b/arch/m68k/fpsp040/binstr.S
@@ -60,9 +60,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BINSTR idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/bugfix.S b/arch/m68k/fpsp040/bugfix.S
index 942c4f6..3bb9c84 100644
--- a/arch/m68k/fpsp040/bugfix.S
+++ b/arch/m68k/fpsp040/bugfix.S
@@ -152,9 +152,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|BUGFIX idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/decbin.S b/arch/m68k/fpsp040/decbin.S
index 2160609..16ed796 100644
--- a/arch/m68k/fpsp040/decbin.S
+++ b/arch/m68k/fpsp040/decbin.S
@@ -69,9 +69,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|DECBIN idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/do_func.S b/arch/m68k/fpsp040/do_func.S
index 81f6a98..3eff99a 100644
--- a/arch/m68k/fpsp040/do_func.S
+++ b/arch/m68k/fpsp040/do_func.S
@@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
DO_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/fpsp.h b/arch/m68k/fpsp040/fpsp.h
index 984a4eb..5df4cd7 100644
--- a/arch/m68k/fpsp040/fpsp.h
+++ b/arch/m68k/fpsp040/fpsp.h
@@ -5,9 +5,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
| fpsp.h --- stack frame offsets during FPSP exception handling
|
diff --git a/arch/m68k/fpsp040/gen_except.S b/arch/m68k/fpsp040/gen_except.S
index 401d06f..3642cb7 100644
--- a/arch/m68k/fpsp040/gen_except.S
+++ b/arch/m68k/fpsp040/gen_except.S
@@ -29,9 +29,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
GEN_EXCEPT: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/get_op.S b/arch/m68k/fpsp040/get_op.S
index c7c2f37..64c36d7 100644
--- a/arch/m68k/fpsp040/get_op.S
+++ b/arch/m68k/fpsp040/get_op.S
@@ -54,9 +54,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
GET_OP: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/kernel_ex.S b/arch/m68k/fpsp040/kernel_ex.S
index 476b711..45bcf34 100644
--- a/arch/m68k/fpsp040/kernel_ex.S
+++ b/arch/m68k/fpsp040/kernel_ex.S
@@ -12,9 +12,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
KERNEL_EX: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/res_func.S b/arch/m68k/fpsp040/res_func.S
index 8f6b952..d9cdf43 100644
--- a/arch/m68k/fpsp040/res_func.S
+++ b/arch/m68k/fpsp040/res_func.S
@@ -16,9 +16,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
RES_FUNC: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/round.S b/arch/m68k/fpsp040/round.S
index 00f9806..f84ae0d 100644
--- a/arch/m68k/fpsp040/round.S
+++ b/arch/m68k/fpsp040/round.S
@@ -8,9 +8,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|ROUND idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sacos.S b/arch/m68k/fpsp040/sacos.S
index 83b00ab..513c7cc 100644
--- a/arch/m68k/fpsp040/sacos.S
+++ b/arch/m68k/fpsp040/sacos.S
@@ -38,9 +38,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SACOS idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sasin.S b/arch/m68k/fpsp040/sasin.S
index 5647a60..2a269a5 100644
--- a/arch/m68k/fpsp040/sasin.S
+++ b/arch/m68k/fpsp040/sasin.S
@@ -38,9 +38,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SASIN idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/satan.S b/arch/m68k/fpsp040/satan.S
index 20dae22..c8a6649 100644
--- a/arch/m68k/fpsp040/satan.S
+++ b/arch/m68k/fpsp040/satan.S
@@ -43,9 +43,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|satan idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/satanh.S b/arch/m68k/fpsp040/satanh.S
index 20f0781..ba91f77 100644
--- a/arch/m68k/fpsp040/satanh.S
+++ b/arch/m68k/fpsp040/satanh.S
@@ -45,9 +45,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|satanh idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/scale.S b/arch/m68k/fpsp040/scale.S
index 5c9b805..04829dd 100644
--- a/arch/m68k/fpsp040/scale.S
+++ b/arch/m68k/fpsp040/scale.S
@@ -21,9 +21,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SCALE idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/scosh.S b/arch/m68k/fpsp040/scosh.S
index e81edbb..07d3a4d 100644
--- a/arch/m68k/fpsp040/scosh.S
+++ b/arch/m68k/fpsp040/scosh.S
@@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SCOSH idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/setox.S b/arch/m68k/fpsp040/setox.S
index 0aa75f9..145af54 100644
--- a/arch/m68k/fpsp040/setox.S
+++ b/arch/m68k/fpsp040/setox.S
@@ -331,9 +331,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|setox idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sgetem.S b/arch/m68k/fpsp040/sgetem.S
index 0fcbd04..d9234f4 100644
--- a/arch/m68k/fpsp040/sgetem.S
+++ b/arch/m68k/fpsp040/sgetem.S
@@ -24,9 +24,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SGETEM idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sint.S b/arch/m68k/fpsp040/sint.S
index 0f9bd28..0e92d4e 100644
--- a/arch/m68k/fpsp040/sint.S
+++ b/arch/m68k/fpsp040/sint.S
@@ -51,9 +51,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SINT idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
index a162919..a8f4161 100644
--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
@@ -30,9 +30,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|
| Modified for Linux-1.3.x by Jes Sorensen ([email protected])
diff --git a/arch/m68k/fpsp040/slog2.S b/arch/m68k/fpsp040/slog2.S
index 517fa45..fac2c73 100644
--- a/arch/m68k/fpsp040/slog2.S
+++ b/arch/m68k/fpsp040/slog2.S
@@ -96,9 +96,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SLOG2 idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/slogn.S b/arch/m68k/fpsp040/slogn.S
index 2aaa072..d98eaf6 100644
--- a/arch/m68k/fpsp040/slogn.S
+++ b/arch/m68k/fpsp040/slogn.S
@@ -63,9 +63,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|slogn idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/smovecr.S b/arch/m68k/fpsp040/smovecr.S
index a0127fa..73c3651 100644
--- a/arch/m68k/fpsp040/smovecr.S
+++ b/arch/m68k/fpsp040/smovecr.S
@@ -15,9 +15,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SMOVECR idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/srem_mod.S b/arch/m68k/fpsp040/srem_mod.S
index 8c8d7f5..a27e70c 100644
--- a/arch/m68k/fpsp040/srem_mod.S
+++ b/arch/m68k/fpsp040/srem_mod.S
@@ -66,9 +66,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
SREM_MOD: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/ssin.S b/arch/m68k/fpsp040/ssin.S
index 043c91c..a1ef8e0 100644
--- a/arch/m68k/fpsp040/ssin.S
+++ b/arch/m68k/fpsp040/ssin.S
@@ -83,9 +83,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SSIN idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/ssinh.S b/arch/m68k/fpsp040/ssinh.S
index c8b3308..8a560ed 100644
--- a/arch/m68k/fpsp040/ssinh.S
+++ b/arch/m68k/fpsp040/ssinh.S
@@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|SSINH idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stan.S b/arch/m68k/fpsp040/stan.S
index b5c2a19..f8553aa 100644
--- a/arch/m68k/fpsp040/stan.S
+++ b/arch/m68k/fpsp040/stan.S
@@ -50,9 +50,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STAN idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stanh.S b/arch/m68k/fpsp040/stanh.S
index 33b0098..7e12e59 100644
--- a/arch/m68k/fpsp040/stanh.S
+++ b/arch/m68k/fpsp040/stanh.S
@@ -49,9 +49,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STANH idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/sto_res.S b/arch/m68k/fpsp040/sto_res.S
index 0cdca3b..484b47d 100644
--- a/arch/m68k/fpsp040/sto_res.S
+++ b/arch/m68k/fpsp040/sto_res.S
@@ -19,9 +19,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
STO_RES: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/stwotox.S b/arch/m68k/fpsp040/stwotox.S
index 4e3c140..0d5e6a1 100644
--- a/arch/m68k/fpsp040/stwotox.S
+++ b/arch/m68k/fpsp040/stwotox.S
@@ -76,9 +76,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|STWOTOX idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/tbldo.S b/arch/m68k/fpsp040/tbldo.S
index fe60cf4..fd5c37a 100644
--- a/arch/m68k/fpsp040/tbldo.S
+++ b/arch/m68k/fpsp040/tbldo.S
@@ -17,9 +17,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|TBLDO idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/util.S b/arch/m68k/fpsp040/util.S
index 452f3d6..65b26fa 100644
--- a/arch/m68k/fpsp040/util.S
+++ b/arch/m68k/fpsp040/util.S
@@ -16,9 +16,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
|UTIL idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_bsun.S b/arch/m68k/fpsp040/x_bsun.S
index 039247b..d5a576b 100644
--- a/arch/m68k/fpsp040/x_bsun.S
+++ b/arch/m68k/fpsp040/x_bsun.S
@@ -13,9 +13,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_BSUN: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_fline.S b/arch/m68k/fpsp040/x_fline.S
index 3917710..264e126 100644
--- a/arch/m68k/fpsp040/x_fline.S
+++ b/arch/m68k/fpsp040/x_fline.S
@@ -13,9 +13,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_FLINE: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_operr.S b/arch/m68k/fpsp040/x_operr.S
index b0f54bc..e2c371c 100644
--- a/arch/m68k/fpsp040/x_operr.S
+++ b/arch/m68k/fpsp040/x_operr.S
@@ -43,9 +43,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_OPERR: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_ovfl.S b/arch/m68k/fpsp040/x_ovfl.S
index 22cb8b4..6fe4989 100644
--- a/arch/m68k/fpsp040/x_ovfl.S
+++ b/arch/m68k/fpsp040/x_ovfl.S
@@ -35,9 +35,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_OVFL: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_snan.S b/arch/m68k/fpsp040/x_snan.S
index 039af57..4ed7664 100644
--- a/arch/m68k/fpsp040/x_snan.S
+++ b/arch/m68k/fpsp040/x_snan.S
@@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_SNAN: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_store.S b/arch/m68k/fpsp040/x_store.S
index 4282fa6..402dc0c 100644
--- a/arch/m68k/fpsp040/x_store.S
+++ b/arch/m68k/fpsp040/x_store.S
@@ -11,9 +11,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_STORE: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unfl.S b/arch/m68k/fpsp040/x_unfl.S
index 077fcc2..eb772ff 100644
--- a/arch/m68k/fpsp040/x_unfl.S
+++ b/arch/m68k/fpsp040/x_unfl.S
@@ -21,9 +21,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNFL: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unimp.S b/arch/m68k/fpsp040/x_unimp.S
index 920cb94..6f382b2 100644
--- a/arch/m68k/fpsp040/x_unimp.S
+++ b/arch/m68k/fpsp040/x_unimp.S
@@ -22,9 +22,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNIMP: |idnt 2,1 | Motorola 040 Floating Point Software Package
diff --git a/arch/m68k/fpsp040/x_unsupp.S b/arch/m68k/fpsp040/x_unsupp.S
index 4ec5728..d7cf462 100644
--- a/arch/m68k/fpsp040/x_unsupp.S
+++ b/arch/m68k/fpsp040/x_unsupp.S
@@ -23,9 +23,8 @@
| Copyright (C) Motorola, Inc. 1990
| All Rights Reserved
|
-| THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF MOTOROLA
-| The copyright notice above does not evidence any
-| actual or intended publication of such source code.
+| For details on the license for this file, please see the
+| file, README, in this same directory.
X_UNSUPP: |idnt 2,1 | Motorola 040 Floating Point Software Package
On Fri, Jan 20, 2006 at 05:24:45PM -0700, Matt Waddel wrote:
> >> Alan Cox wrote:
> >>
> >>> On Gwe, 2006-01-20 at 07:21 -0500, Ric Wheeler wrote:
> >>>
> >>>> The language in the source files is pretty strong and this looks
> >>>> like
> >>>> Motorola should be asked to rerelease the files with a normal
> >>>> copyright notice in place of the current language...
> >>>>
> >>>
> >>> Its standard boilerplate from the period. Its a perfectly normal and
> >>> clear copyright notice.
> >>>
> >>> Alan
> >>>
> >> Actually, that is the exact language our lawyers still give us to
> >> use today when we have not settled on license terms when we want to
> >> share code in a severely limited fashion.
> >>
> >> I still think it best that they (Freescale) modify their language
> >> to reference the actual license grant in the README.
> >
> >Good luck finding anyone in Freescale that would have any idea about
> >this.
> >
> >- kumar
> >-
>
> I have been given permission to fix the "UNPUBLISHED PROPRIETARY
> SOURCE CODE OF MOTOROLA ..." section in the source files of fpsp040/
> directory.
>
> One suggestion, so we don't have to revisit this topic in 16 years
> from now again, shouldn't we just remove the UNPUBLISHED ... comment
> altogether and replace it with Greg Kroah-Hartman's suggested verbiage
> as in the patch below?
Sure, that works for me. Anyone going to forward this upstream?
Thanks a lot for looking into this,
greg k-h
On Gwe, 2006-01-20 at 17:24 -0700, Matt Waddel wrote:
> I have been given permission to fix the "UNPUBLISHED PROPRIETARY
> SOURCE CODE OF MOTOROLA ..." section in the source files of fpsp040/
> directory.
>
> One suggestion, so we don't have to revisit this topic in 16 years
> from now again, shouldn't we just remove the UNPUBLISHED ... comment
> altogether and replace it with Greg Kroah-Hartman's suggested verbiage
> as in the patch below?
Looks sensible (sorry was a bit busy) and now catching up on email. Does
need a "signed-off-by:" line.
Thanks
Alan
Alan Cox wrote:
> On Gwe, 2006-01-20 at 17:24 -0700, Matt Waddel wrote:
>
>>I have been given permission to fix the "UNPUBLISHED PROPRIETARY
>>SOURCE CODE OF MOTOROLA ..." section in the source files of fpsp040/
>>directory.
>>
>>One suggestion, so we don't have to revisit this topic in 16 years
>>from now again, shouldn't we just remove the UNPUBLISHED ... comment
>>altogether and replace it with Greg Kroah-Hartman's suggested verbiage
>>as in the patch below?
>
>
> Looks sensible (sorry was a bit busy) and now catching up on email. Does
> need a "signed-off-by:" line.
>
Hi Alan,
There was a "signed-off-by:" line just before the diff started. Sorry
if it was buried too far down. Do you need me to resend the patch
again?
Regards,
Matt
Signed-off-by: Matt Waddel <[email protected]>
>
> Thanks
> Alan
>
>