Changeset 7ee0e2f in mainline for generic

Timestamp:

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

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2f40fe4

Parents:

e45f81a

Message:

Remove unneeded FRAME_PANIC.
Fix some things broken by last commit.

Location:

generic

Files:

• include/mm/frame.h (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)
• src/mm/frame.c (modified) (1 diff)

generic/include/mm/frame.h

@@ -59 +59 @@
 
 #define FRAME_KA                0x1     /* skip frames conflicting with user address space */
-#define FRAME_PANIC             0x2     /* panic on failure */
-#define FRAME_ATOMIC            0x4     /* do not panic and do not sleep on failure */
-#define FRAME_NO_RECLAIM        0x8     /* do not start reclaiming when no free memory */
+#define FRAME_ATOMIC            0x2     /* do not panic and do not sleep on failure */
+#define FRAME_NO_RECLAIM        0x4     /* do not start reclaiming when no free memory */
 
 #define FRAME_OK                0       /* frame_alloc return status */

generic/src/cpu/cpu.c

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

generic/src/mm/frame.c

@@ -960 +960 @@
         }
         if (!zone) {
-                if (flags & FRAME_PANIC)
-                        panic("Can't allocate frame.\n");
-                
                 /*
                  * TODO: Sleep until frames are available again.