Changeset 6a44ee4 in mainline for boot/arch/sparc64/src/main.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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:

• boot/arch/sparc64/src/main.c (modified) (1 diff)

boot/arch/sparc64/src/main.c

@@ -182 +182 @@
          * of the "/memory" node to find out which parts of memory
          * are used by OBP and redesign the algorithm of copying
-         * kernel/init tasks/ramdisk from the bootable image to memory
-         * (which we must do anyway because of issues with claiming the memory
-         * on Serengeti).
-         *
+         * kernel/init tasks/ramdisk from the bootable image to memory.
          */
         bootinfo.physmem_start += OBP_BIAS;