Changeset 2e9eae2 in mainline for arch

Timestamp:

2006-06-23T16:03:53Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

757551a3

Parents:

a832dd7

Message:

Changed interface of frame_alloc/free to use address of frame instead of the pfn.
This makes it impossible to use >4GB of memory on 32-bit machines, but who cares…

Location:

arch

Files:

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

arch/ia32/src/smp/smp.c

@@ -74 +74 @@
         }
 
-        l_apic_address = PA2KA(PFN2ADDR(frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status)));
+        l_apic_address = (__address) frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status);
         if (status != FRAME_OK)
                 panic("cannot allocate address for l_apic\n");
 
-        io_apic_address = PA2KA(PFN2ADDR(frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status)));
+        io_apic_address = (__address) frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status);
         if (status != FRAME_OK)
                 panic("cannot allocate address for io_apic\n");

arch/ia64/src/mm/vhpt.c

@@ -43 +43 @@
 __address vhpt_set_up(void)
 {
-        vhpt_base=(vhpt_entry_t*) PA2KA(PFN2ADDR(frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA)));
+        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_invalidate_all();

arch/ppc64/src/mm/page.c

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

arch/sparc64/src/mm/page.c

@@ -74 +74 @@
                 order = (fnzb32(size - 1) + 1) - FRAME_WIDTH;
         
-        __address virtaddr = PA2KA(PFN2ADDR(frame_alloc(order, FRAME_KA)));
+        __address virtaddr = frame_alloc(order, FRAME_KA);
 
         for (i = 0; i < sizemap[order].count; i++)