Changeset bd48f4c in mainline for boot/arch/ia64/src/asm.S

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/ia64/src/asm.S (modified) (1 diff)

boot/arch/ia64/src/asm.S

@@ -113 +113 @@
 jump_to_kernel:
         alloc loc0 = ar.pfs, 1, 1, 0, 0
-        mov r1 = in0 ;;                 # Pass bootinfo address
+        mov r2 = in0 ;;                 # Pass bootinfo address
         movl r8 = KERNEL_ADDRESS;;
         mov b1 = r8 ;;