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

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

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
-        uint8_t order = fnzb32(
-                (TSB_ENTRY_COUNT * sizeof(tsb_entry_t)) >> FRAME_WIDTH);
-        
-        uintptr_t tsb = (uintptr_t) frame_alloc(order, flags);
-        
+        uintptr_t tsb =
+            frame_alloc(SIZE2FRAMES(TSB_ENTRY_COUNT * sizeof(tsb_entry_t)),
+            flags, 0);
         if (!tsb)
                 return -1;
@@ -92 +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;