From 2e0cf58da9949572c6e334a07bba6774fdb749f9 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Sat, 9 Dec 2006 11:14:01 -0600 Subject: [PATCH] Switch to a simple X11-style license. --- LICENSE | 14 +++----------- doc/attributions | 14 +++----------- doc/copyright-header | 14 +++----------- idlcomp/idlc.h | 14 +++----------- idlcomp/languages/c++/interface-caller.cc | 14 +++----------- idlcomp/languages/c++/main.cc | 14 +++----------- idlcomp/languages/c++/server.cc | 14 +++----------- include/c++/util/heap.h | 14 +++----------- include/c++/util/rbtree.h | 14 +++----------- kernel/arch/x64/descriptors.cc | 14 +++----------- kernel/arch/x64/entry.S | 14 +++----------- kernel/arch/x64/mem.cc | 14 +++----------- kernel/arch/x64/misc.cc | 14 +++----------- kernel/arch/x64/multiboot.cc | 14 +++----------- kernel/arch/x64/thread.cc | 14 +++----------- kernel/arch/x86/descriptors.cc | 14 +++----------- kernel/arch/x86/entry.S | 14 +++----------- kernel/arch/x86/mem.cc | 14 +++----------- kernel/arch/x86/misc.cc | 14 +++----------- kernel/arch/x86/multiboot.cc | 14 +++----------- kernel/arch/x86/thread.cc | 14 +++----------- kernel/core/event.cc | 14 +++----------- kernel/core/init.cc | 14 +++----------- kernel/core/irq.cc | 14 +++----------- kernel/core/lock.cc | 14 +++----------- kernel/core/thread.cc | 14 +++----------- kernel/core/time.cc | 14 +++----------- kernel/io/console/misc.cc | 14 +++----------- kernel/io/console/vga.cc | 14 +++----------- kernel/io/irq/i8259.cc | 14 +++----------- kernel/io/timer/i8254.cc | 14 +++----------- kernel/lib/libc.cc | 14 +++----------- kernel/mem/addrspace.cc | 14 +++----------- kernel/mem/orbmm.cc | 14 +++----------- kernel/mem/pagealloc.cc | 14 +++----------- kernel/mem/pagetable.cc | 14 +++----------- kernel/mem/rmap.cc | 14 +++----------- kernel/orb/invoke.cc | 14 +++----------- kernel/tests/aspace.cc | 14 +++----------- kernel/tests/mutex.cc | 14 +++----------- kernel/tests/threads.cc | 14 +++----------- lib/kernel/time/timer.cc | 14 +++----------- 42 files changed, 126 insertions(+), 462 deletions(-) diff --git a/LICENSE b/LICENSE index 0d32b62..c014cf7 100644 --- a/LICENSE +++ b/LICENSE @@ -6,18 +6,10 @@ this software and associated documentation files (the "Software"), to deal with 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: +so, subject to the following condition: - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - - * The names of the Software's authors and/or contributors - may not be used to endorse or promote products derived from - this Software without specific prior written permission. +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 diff --git a/doc/attributions b/doc/attributions index 5b67798..dd98a01 100644 --- a/doc/attributions +++ b/doc/attributions @@ -16,18 +16,10 @@ Original code written by Scott Wood // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/doc/copyright-header b/doc/copyright-header index 3150645..c4208eb 100644 --- a/doc/copyright-header +++ b/doc/copyright-header @@ -6,18 +6,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/idlcomp/idlc.h b/idlcomp/idlc.h index 94f7ae2..783940a 100644 --- a/idlcomp/idlc.h +++ b/idlcomp/idlc.h @@ -8,18 +8,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/idlcomp/languages/c++/interface-caller.cc b/idlcomp/languages/c++/interface-caller.cc index c6e87a1..2bdfc22 100644 --- a/idlcomp/languages/c++/interface-caller.cc +++ b/idlcomp/languages/c++/interface-caller.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/idlcomp/languages/c++/main.cc b/idlcomp/languages/c++/main.cc index cfdb16b..c634cee 100644 --- a/idlcomp/languages/c++/main.cc +++ b/idlcomp/languages/c++/main.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/idlcomp/languages/c++/server.cc b/idlcomp/languages/c++/server.cc index 35f61d6..86d1f9a 100644 --- a/idlcomp/languages/c++/server.cc +++ b/idlcomp/languages/c++/server.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/include/c++/util/heap.h b/include/c++/util/heap.h index 482039a..88813e0 100644 --- a/include/c++/util/heap.h +++ b/include/c++/util/heap.h @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/include/c++/util/rbtree.h b/include/c++/util/rbtree.h index 3b98b5e..d877aab 100644 --- a/include/c++/util/rbtree.h +++ b/include/c++/util/rbtree.h @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/descriptors.cc b/kernel/arch/x64/descriptors.cc index 57d1509..6b039d2 100644 --- a/kernel/arch/x64/descriptors.cc +++ b/kernel/arch/x64/descriptors.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/entry.S b/kernel/arch/x64/entry.S index 04d602c..2dddb44 100644 --- a/kernel/arch/x64/entry.S +++ b/kernel/arch/x64/entry.S @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/mem.cc b/kernel/arch/x64/mem.cc index 086be02..50343fc 100644 --- a/kernel/arch/x64/mem.cc +++ b/kernel/arch/x64/mem.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/misc.cc b/kernel/arch/x64/misc.cc index 14e5e16..663204c 100644 --- a/kernel/arch/x64/misc.cc +++ b/kernel/arch/x64/misc.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/multiboot.cc b/kernel/arch/x64/multiboot.cc index b06651e..ed1cda7 100644 --- a/kernel/arch/x64/multiboot.cc +++ b/kernel/arch/x64/multiboot.cc @@ -8,18 +8,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x64/thread.cc b/kernel/arch/x64/thread.cc index 3b1b086..51f17ff 100644 --- a/kernel/arch/x64/thread.cc +++ b/kernel/arch/x64/thread.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/descriptors.cc b/kernel/arch/x86/descriptors.cc index e1a32bb..9a8d0ce 100644 --- a/kernel/arch/x86/descriptors.cc +++ b/kernel/arch/x86/descriptors.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/entry.S b/kernel/arch/x86/entry.S index 6d62cf2..3cbed22 100644 --- a/kernel/arch/x86/entry.S +++ b/kernel/arch/x86/entry.S @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/mem.cc b/kernel/arch/x86/mem.cc index 9b0241b..13aa79d 100644 --- a/kernel/arch/x86/mem.cc +++ b/kernel/arch/x86/mem.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/misc.cc b/kernel/arch/x86/misc.cc index bb01a16..a747fb8 100644 --- a/kernel/arch/x86/misc.cc +++ b/kernel/arch/x86/misc.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/multiboot.cc b/kernel/arch/x86/multiboot.cc index 661822f..9cc5d49 100644 --- a/kernel/arch/x86/multiboot.cc +++ b/kernel/arch/x86/multiboot.cc @@ -8,18 +8,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/arch/x86/thread.cc b/kernel/arch/x86/thread.cc index 150892a..5ec4c7d 100644 --- a/kernel/arch/x86/thread.cc +++ b/kernel/arch/x86/thread.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/event.cc b/kernel/core/event.cc index 54c9d43..06d3b28 100644 --- a/kernel/core/event.cc +++ b/kernel/core/event.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/init.cc b/kernel/core/init.cc index 2c874e5..28af1b6 100644 --- a/kernel/core/init.cc +++ b/kernel/core/init.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/irq.cc b/kernel/core/irq.cc index c1496e0..4ba0b69 100644 --- a/kernel/core/irq.cc +++ b/kernel/core/irq.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/lock.cc b/kernel/core/lock.cc index 5f046df..641c8ac 100644 --- a/kernel/core/lock.cc +++ b/kernel/core/lock.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/thread.cc b/kernel/core/thread.cc index 9e412df..1923739 100644 --- a/kernel/core/thread.cc +++ b/kernel/core/thread.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/core/time.cc b/kernel/core/time.cc index 2dd42b4..2dfd055 100644 --- a/kernel/core/time.cc +++ b/kernel/core/time.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/io/console/misc.cc b/kernel/io/console/misc.cc index 8a586a4..b66e4ae 100644 --- a/kernel/io/console/misc.cc +++ b/kernel/io/console/misc.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/io/console/vga.cc b/kernel/io/console/vga.cc index 27c5d75..d124177 100644 --- a/kernel/io/console/vga.cc +++ b/kernel/io/console/vga.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/io/irq/i8259.cc b/kernel/io/irq/i8259.cc index 65a658f..9c970df 100644 --- a/kernel/io/irq/i8259.cc +++ b/kernel/io/irq/i8259.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/io/timer/i8254.cc b/kernel/io/timer/i8254.cc index 9dd04b3..c5cbabf 100644 --- a/kernel/io/timer/i8254.cc +++ b/kernel/io/timer/i8254.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/lib/libc.cc b/kernel/lib/libc.cc index 3e77d46..f03c17c 100644 --- a/kernel/lib/libc.cc +++ b/kernel/lib/libc.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/mem/addrspace.cc b/kernel/mem/addrspace.cc index f014c54..397f6a6 100644 --- a/kernel/mem/addrspace.cc +++ b/kernel/mem/addrspace.cc @@ -14,18 +14,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/mem/orbmm.cc b/kernel/mem/orbmm.cc index 938e2f2..33c9bd6 100644 --- a/kernel/mem/orbmm.cc +++ b/kernel/mem/orbmm.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/mem/pagealloc.cc b/kernel/mem/pagealloc.cc index 22a05cd..7a0a6ee 100644 --- a/kernel/mem/pagealloc.cc +++ b/kernel/mem/pagealloc.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/mem/pagetable.cc b/kernel/mem/pagetable.cc index 93a7cae..04802ca 100644 --- a/kernel/mem/pagetable.cc +++ b/kernel/mem/pagetable.cc @@ -12,18 +12,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/mem/rmap.cc b/kernel/mem/rmap.cc index 0b08b74..a797995 100644 --- a/kernel/mem/rmap.cc +++ b/kernel/mem/rmap.cc @@ -8,18 +8,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/orb/invoke.cc b/kernel/orb/invoke.cc index 73ada04..2deabe5 100644 --- a/kernel/orb/invoke.cc +++ b/kernel/orb/invoke.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/tests/aspace.cc b/kernel/tests/aspace.cc index a9537df..5a3b15c 100644 --- a/kernel/tests/aspace.cc +++ b/kernel/tests/aspace.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/tests/mutex.cc b/kernel/tests/mutex.cc index a92cd4f..8a534e1 100644 --- a/kernel/tests/mutex.cc +++ b/kernel/tests/mutex.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/kernel/tests/threads.cc b/kernel/tests/threads.cc index c4111e7..f99af20 100644 --- a/kernel/tests/threads.cc +++ b/kernel/tests/threads.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 diff --git a/lib/kernel/time/timer.cc b/lib/kernel/time/timer.cc index b495e31..ddee5b7 100644 --- a/lib/kernel/time/timer.cc +++ b/lib/kernel/time/timer.cc @@ -7,18 +7,10 @@ // 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: +// so, subject to the following condition: // -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimers in the -// documentation and/or other materials provided with the distribution. -// -// * The names of the Software's authors and/or contributors -// may not be used to endorse or promote products derived from -// this Software without specific prior written permission. +// 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 -- 2.39.2