Changeset 91d6d28 in mainline

Timestamp:

2006-11-20T19:19:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f5926ad9

Parents:

aa802679

Message:

Take the possible difference between kernel and physical address into account in TSB and userspace window buffer
allocation and deallocation code.

Location:

kernel/arch/sparc64/src

Files:

• mm/as.c (modified) (2 diffs)
• proc/thread.c (modified) (2 diffs)

kernel/arch/sparc64/src/mm/as.c

@@ -63 +63 @@
 #ifdef CONFIG_TSB
         int order = fnzb32(((ITSB_ENTRY_COUNT+DTSB_ENTRY_COUNT)*sizeof(tsb_entry_t))>>FRAME_WIDTH);
-        uintptr_t tsb = (uintptr_t) frame_alloc(order, flags);
+        uintptr_t tsb = (uintptr_t) frame_alloc(order, flags | FRAME_KA);
 
         if (!tsb)
@@ -79 +79 @@
 #ifdef CONFIG_TSB
         count_t cnt = ((ITSB_ENTRY_COUNT+DTSB_ENTRY_COUNT)*sizeof(tsb_entry_t))>>FRAME_WIDTH;
-        frame_free((uintptr_t) as->arch.itsb);
+        frame_free(KA2PA((uintptr_t) as->arch.itsb));
         return cnt;
 #else

kernel/arch/sparc64/src/proc/thread.c

@@ -55 +55 @@
                  * belonging to a killed thread.
                  */
-                frame_free(ALIGN_DOWN((uintptr_t) t->arch.uspace_window_buffer, PAGE_SIZE));
+                frame_free(KA2PA(ALIGN_DOWN((uintptr_t) t->arch.uspace_window_buffer, PAGE_SIZE)));
         }
 }
@@ -66 +66 @@
                  * returned from the slab allocator doesn't have any.
                  */
-                t->arch.uspace_window_buffer = frame_alloc(ONE_FRAME, 0);
+                t->arch.uspace_window_buffer = frame_alloc(ONE_FRAME, FRAME_KA);
         } else {
                 uintptr_t uw_buf = (uintptr_t) t->arch.uspace_window_buffer;