Changeset 40c8c17 in mainline for kernel/arch/sparc64

Timestamp:

2011-11-26T21:37:40Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

38ff925

Parents:

056ddc30

Message:

Replace multiple definitions of last_frame with config.physmem_end.
Do not duplicate code which calculates the end of physical memory.

Location:

kernel/arch/sparc64

Files:

• include/mm/sun4u/frame.h (modified) (1 diff)
• include/mm/sun4v/frame.h (modified) (1 diff)
• src/mm/sun4u/frame.c (modified) (3 diffs)

kernel/arch/sparc64/include/mm/sun4u/frame.h

@@ -72 +72 @@
 typedef union frame_address frame_address_t;
 
-extern uintptr_t last_frame;
 extern uintptr_t end_of_identity;
 

kernel/arch/sparc64/include/mm/sun4v/frame.h

@@ -46 +46 @@
 #include <typedefs.h>
 
-extern uintptr_t last_frame;
 extern void frame_low_arch_init(void);
 extern void frame_high_arch_init(void);

kernel/arch/sparc64/src/mm/sun4u/frame.c

@@ -41 +41 @@
 #include <macros.h>
 
-// TODO: remove me
-uintptr_t last_frame = (uintptr_t) NULL;
-
 /** Create memory zones according to information stored in memmap.
  *
@@ -66 +63 @@
                     (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
                 
-                // TODO: remove me
-                last_frame = max(last_frame, base + size);
-
                 if (!frame_adjust_zone_bounds(low, &base, &size))
                         continue;
@@ -106 +100 @@
          */
         frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
-        
-        end_of_identity = PA2KA(last_frame);
+
+        /* PA2KA will work only on low-memory. */
+        end_of_identity = PA2KA(config.physmem_end - FRAME_SIZE) + PAGE_SIZE;
 }