Switch to a simple X11-style license.

[polintos/scott/priv.git] / kernel / mem / pagetable.cc

diff --git a/kernel/mem/pagetable.cc b/kernel/mem/pagetable.cc
index 976e579286b5d076b0652bc7e88de788e8522723..04802cab90ef67247a0a34b4f6609bdd49b14ca2 100644 (file)
--- 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
@@ -421,7 +413,7 @@ namespace Mem {
        }
        
        template <typename PTE>
-       void PageTableImpl<PTE>::get_entry(u64 addr, u64 *phys, Flags *flags)
+       void PageTableImpl<PTE>::get_mapping(u64 addr, u64 *phys, Flags *flags)
        {
                Lock::AutoLock autolock(lock);
                int shift = toplevel_shift;