Changeset 7ee0e2f in mainline

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.

Files:

• arch/ia64/src/mm/vhpt.c (modified) (1 diff)
• arch/ppc64/src/mm/page.c (modified) (1 diff)
• genarch/src/mm/as_pt.c (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/cpu/cpu.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)
• test/mm/falloc1/test.c (modified) (2 diffs)
• test/mm/falloc2/test.c (modified) (2 diffs)

arch/ia64/src/mm/vhpt.c

@@ -43 +43 @@
 __address vhpt_set_up(void)
 {
-        vhpt_base=(vhpt_entry_t*) frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA);
-        if(!vhpt_base) panic("Kernel configured with VHPT but no memory for table.");
+        vhpt_base = frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA | FRAME_ATOMIC);
+        if(!vhpt_base) 
+                panic("Kernel configured with VHPT but no memory for table.");
         vhpt_invalidate_all();
         return (__address) vhpt_base;

arch/ppc64/src/mm/page.c

@@ -275 +275 @@
                 
                 /* Allocate page hash table */
-                phte_t *physical_phte = (phte_t *) frame_alloc(PHT_ORDER, FRAME_KA | FRAME_PANIC);
+                phte_t *physical_phte = (phte_t *) frame_alloc(PHT_ORDER, FRAME_KA | FRAME_ATOMIC);
                 
                 ASSERT((__address) physical_phte % (1 << PHT_BITS) == 0);

genarch/src/mm/as_pt.c

@@ -74 +74 @@
         ipl_t ipl;
 
-        dst_ptl0 = (pte_t *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
+        dst_ptl0 = (pte_t *) frame_alloc(ONE_FRAME, FRAME_KA);
 
         if (flags & FLAG_AS_KERNEL) {

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.

test/mm/falloc1/test.c

@@ -55 +55 @@
                         allocated = 0;
                         for (i = 0; i < MAX_FRAMES >> order; i++) {
-                                frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                frames[allocated] = (__address) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
@@ -61 +61 @@
                                 }
                                 
-                                if (status == 0) {
+                                if (frames[allocated]) {
                                         allocated++;
                                 } else {

test/mm/falloc2/test.c

@@ -52 +52 @@
 void falloc(void * arg)
 {
-        int status, order, run, allocated, i;
+        int order, run, allocated, i;
         __u8 val = THREAD->tid % THREADS;
         index_t k;
@@ -66 +66 @@
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status);
-                                if (status == 0) {
+                                frames[allocated] = (__address)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                if (frames[allocated]) {
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);
                                         allocated++;