Changeset 7ee0e2f in mainline for arch

Timestamp:

2006-06-26T10:18:05Z (20 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:

arch

Files:

• ia64/src/mm/vhpt.c (modified) (1 diff)
• ppc64/src/mm/page.c (modified) (1 diff)

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);