Changeset 9b9e385 in mainline for generic

Timestamp:

2006-02-05T16:08:27Z (20 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

266294a9

Parents:

328e0d3

Message:

frame_alloc() functions variations in order to avoid problems with frame_alloc_generic() changes.
IMPORTANT: Parameter order for frame_alloc() was changed

Location:

generic

Files:

• include/mm/frame.h (modified) (2 diffs)
• src/cpu/cpu.c (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)
• src/mm/slab.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

generic/include/mm/frame.h

@@ -62 +62 @@
 #define ZONE_BLACKLIST_SIZE     8
 
+#define frame_alloc(order, flags)                               frame_alloc_generic(order, flags, NULL, NULL)
+#define frame_alloc_rc(order, flags, status)                    frame_alloc_generic(order, flags, status, NULL)
+#define frame_alloc_rc_zone(order, flags, status, zone)         frame_alloc_generic(order, flags, status, zone)
+
 struct zone {
         link_t link;            /**< link to previous and next zone */
@@ -102 +106 @@
 extern void frame_initialize(frame_t *frame, zone_t *zone);
 
-__address frame_alloc(int flags, __u8 order, int * status, zone_t **pzone);
+__address frame_alloc_generic(__u8 order, int flags, int * status, zone_t **pzone);
+
+
 extern void frame_free(__address addr);
 

generic/src/cpu/cpu.c

@@ -62 +62 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL, NULL);
+                        cpus[i].stack = (__u8 *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
                         
                         cpus[i].id = i;

generic/src/mm/as.c

@@ -257 +257 @@
          *   the different causes
          */
-        frame = frame_alloc(0, ONE_FRAME, NULL, NULL);
+        frame = frame_alloc(ONE_FRAME, 0);
         memsetb(PA2KA(frame), FRAME_SIZE, 0);
         

generic/src/mm/frame.c

@@ -110 +110 @@
  * @return Allocated frame.
  */
-__address frame_alloc(int flags, __u8 order, int * status, zone_t **pzone) 
+__address frame_alloc_generic(__u8 order, int flags, int * status, zone_t **pzone) 
 {
         ipl_t ipl;

generic/src/mm/slab.c

@@ -156 +156 @@
         frame_t *frame;
 
-        data = (void *)frame_alloc(FRAME_KA | flags, cache->order, &status, &zone);
+        data = (void *)frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
         if (status != FRAME_OK) {
                 return NULL;

generic/src/proc/thread.c

@@ -167 +167 @@
                 spinlock_initialize(&t->lock, "thread_t_lock");
         
-                frame_ks = frame_alloc(FRAME_KA, ONE_FRAME, NULL, NULL);
+                frame_ks = frame_alloc(ONE_FRAME, FRAME_KA);
                 if (THREAD_USER_STACK & flags) {
-                        frame_us = frame_alloc(FRAME_KA, ONE_FRAME, NULL,NULL);
+                        frame_us = frame_alloc(ONE_FRAME, FRAME_KA);
                 }