update

[polintos/scott/priv.git] / kernel / arch / x64 / misc.cc

diff --git a/kernel/arch/x64/misc.cc b/kernel/arch/x64/misc.cc
index 14e5e16411f09ec0ec05d991847bc077e9d73407..bd2ae0fe7c39d46232bd79de3521d62333cb6b12 100644 (file)
--- a/kernel/arch/x64/misc.cc
+++ b/kernel/arch/x64/misc.cc
@@ -2,31 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// 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:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-//     * 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/types.h>
 #include <kern/libc.h>
@@ -105,8 +89,8 @@ namespace Arch {
                x64_gdt[4].base_high = (tss_addr & 0xff000000) >> 24;
                
                asm volatile("ltr %w0" : : "r" (0x20) : "memory");
-               init_thread->addr_space = new Mem::AddrSpace(x64_init_ptbl_l4);
-               init_thread->active_addr_space = init_thread->addr_space;
+               init_thread->aspace = new Mem::AddrSpace(x64_init_ptbl_l4);
+               init_thread->active_aspace = init_thread->aspace;
        }
 
        void timer_init()
@@ -167,7 +151,7 @@ extern "C" void x64_do_page_fault(u64 *stack, u64 fault_addr, u32 error_code)
                goto bad_fault;
        
        // Don't allow fault-ins using a borrowed addr-space.
-       as = curthread->addr_space;
+       as = curthread->aspace;
 
        if (!as || curthread == Arch::init_thread)
                goto bad_fault;