Changeset 25a76ab8 in mainline for kernel/arch/sparc64/src/mm/sun4u/frame.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/mm/sun4u/frame.c (modified) (2 diffs)

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

@@ -43 +43 @@
 uintptr_t last_frame = NULL;
 
-/** Create memory zones according to information stored in bootinfo.
+/** Create memory zones according to information stored in memmap.
  *
- * Walk the bootinfo memory map and create frame zones according to it.
+ * Walk the memory map and create frame zones according to it.
  */
 void frame_arch_init(void)
@@ -53 +53 @@
 
         if (config.cpu_active == 1) {
-                for (i = 0; i < bootinfo.memmap.count; i++) {
-                        uintptr_t start = bootinfo.memmap.zones[i].start;
-                        size_t size = bootinfo.memmap.zones[i].size;
+                for (i = 0; i < memmap.cnt; i++) {
+                        uintptr_t start = (uintptr_t) memmap.zones[i].start;
+                        size_t size = memmap.zones[i].size;
 
                         /*