Changeset e45f81a in mainline for generic/src

Timestamp:

2006-06-26T10:07:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7ee0e2f

Parents:

430f12c

Message:

Changed frame_alloc call, cleaned a lot of stuff, fixed some not-perfectly-correct error handling.

Location:

generic/src

Files:

• mm/frame.c (modified) (3 diffs)
• mm/slab.c (modified) (1 diff)
• proc/thread.c (modified) (2 diffs)

generic/src/mm/frame.c

@@ -932 +932 @@
  *
  */
-void * frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
+void * frame_alloc_generic(__u8 order, int flags, int *pzone) 
 {
         ipl_t ipl;
@@ -968 +968 @@
                 interrupts_restore(ipl);
 
-                if (flags & FRAME_ATOMIC) {
-                        ASSERT(status != NULL);
-                        if (status)
-                                *status = FRAME_NO_MEMORY;
+                if (flags & FRAME_ATOMIC)
                         return 0;
-                }
                 
                 panic("Sleep not implemented.\n");
@@ -984 +980 @@
         spinlock_unlock(&zone->lock);
         interrupts_restore(ipl);
-
-        if (status)
-                *status = FRAME_OK;
 
         if (flags & FRAME_KA)

generic/src/mm/slab.c

@@ -162 +162 @@
         size_t fsize;
         int i;
-        int status;
         int zone=0;
         
-        data = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
-        if (status != FRAME_OK) {
+        data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
+        if (!data) {
                 return NULL;
         }

generic/src/proc/thread.c

@@ -125 +125 @@
 {
         thread_t *t = (thread_t *)obj;
-        int status;
 
         spinlock_initialize(&t->lock, "thread_t_lock");
@@ -142 +141 @@
 #endif  
 
-        t->kstack = frame_alloc_rc(STACK_FRAMES, FRAME_KA | kmflags,&status);
-        if (status) {
+        t->kstack = frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
+        if (! t->kstack) {
 #ifdef ARCH_HAS_FPU
                 if (t->saved_fpu_context)