Remove MIT copyright notice and license.

Pintos used to contain a loader and I/O functions derived from MIT
code, but this has now been entirely eliminated, so there is no
longer any reason to retain the MIT copyright notice or license.

diff --git a/AUTHORS b/AUTHORS
index cf5844ad2a42abb73ec485c891f4917d8ce5ac4d..784002e03f3469101e9fbd2d10a97c9f1344c24d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,10 +11,6 @@ src                                                  -*- text -*-
   Nachos C++ code into C.  These files bear the original UCB license
   notice.
 
-* Some of the source code is derived from code used in the
-  Massachusetts Institute of Technology's 6.828 advanced operating
-  systems course.  These files bear the original MIT license notice.
-
 projects
 --------
 

diff --git a/LICENSE b/LICENSE
index 8702541a9c913e71669cc6ef62cef16543f688c4..64103d04933a619ee4de73ab0868077010fe2ef2 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -54,42 +54,3 @@ license:
    PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
    MODIFICATIONS.
 */
-
-Also, code derived from MIT's 6.828 course code is subject to the
-following license:
-
-/*
- * Copyright (C) 1997 Massachusetts Institute of Technology 
- *
- * This software is being provided by the copyright holders under the
- * following license. By obtaining, using and/or copying this software,
- * you agree that you have read, understood, and will comply with the
- * following terms and conditions:
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose and without fee or royalty is
- * hereby granted, provided that the full text of this NOTICE appears on
- * ALL copies of the software and documentation or portions thereof,
- * including modifications, that you make.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
- * BUT NOT LIMITATION, COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
- * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR
- * THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY
- * THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. COPYRIGHT
- * HOLDERS WILL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE OR
- * DOCUMENTATION.
- *
- * The name and trademarks of copyright holders may NOT be used in
- * advertising or publicity pertaining to the software without specific,
- * written prior permission. Title to copyright in this software and any
- * associated documentation will at all times remain with copyright
- * holders. See the file AUTHORS which should have accompanied this software
- * for a list of all copyright holders.
- *
- * This file may be derived from previously copyrighted software. This
- * copyright applies only to those changes made by the copyright
- * holders listed in the AUTHORS file. The rest of this file is covered by
- * the copyright notices, if any, listed below.
- */

diff --git a/doc/license.texi b/doc/license.texi
index 571a131aa9682ac8b46a88f1230a67b661598b8e..412b5a7b72c0bd3827cb7ba46181c0c23a7c423d 100644 (file)
--- a/doc/license.texi
+++ b/doc/license.texi
@@ -60,42 +60,3 @@ BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 MODIFICATIONS.
 @end quotation
-
-Code derived from MIT's 6.828 course code is subject to the
-following license:
-
-@quotation
-Copyright @copyright{} 1997 Massachusetts Institute of Technology 
-
-This software is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this software,
-you agree that you have read, understood, and will comply with the
-following terms and conditions:
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose and without fee or royalty is
-hereby granted, provided that the full text of this NOTICE appears on
-ALL copies of the software and documentation or portions thereof,
-including modifications, that you make.
-
-THIS SOFTWARE IS PROVIDED ``AS IS,'' AND COPYRIGHT HOLDERS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
-BUT NOT LIMITATION, COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR
-THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. COPYRIGHT
-HOLDERS WILL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE OR
-DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright
-holders. See the file AUTHORS which should have accompanied this software
-for a list of all copyright holders.
-
-This file may be derived from previously copyrighted software. This
-copyright applies only to those changes made by the copyright
-holders listed in the AUTHORS file. The rest of this file is covered by
-the copyright notices, if any, listed below.
-@end quotation