Changeset cd3b380 in mainline for kernel/arch/sparc64/src/mm/sun4v/as.c

Timestamp:

2013-09-11T11:56:39Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

File:

• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (2 diffs)

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

@@ -66 +66 @@
 {
 #ifdef CONFIG_TSB
-        size_t frames =
-            SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t));
-        
-        uintptr_t tsb = frame_alloc(frames, flags, 0);
+        uintptr_t tsb =
+            frame_alloc(SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t)),
+            flags, 0);
         if (!tsb)
                 return -1;
@@ -91 +90 @@
 {
 #ifdef CONFIG_TSB
-        size_t cnt = (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH;
-        frame_free((uintptr_t) as->arch.tsb_description.tsb_base);
+        size_t frames = SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t));
+        frame_free(as->arch.tsb_description.tsb_base, frames);
         
-        return cnt;
+        return frames;
 #else
         return 0;