Changeset bd48f4c in mainline for kernel/arch/ia64/src/start.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:

• kernel/arch/ia64/src/start.S (modified) (2 diffs)

kernel/arch/ia64/src/start.S

@@ -47 +47 @@
 
 stack0:
+
+#
+# Kernel entry point.
+#
+# This is where we are passed control from the boot code.
+# Register contents:
+#
+#       r2      Address of the boot code's bootinfo structure.
+#
 kernel_image_start:
         .auto
@@ -157 +166 @@
         loadrs
         
-        # Initialize memory stack to some sane value
-        movl r12 = stack0 ;;
-        add r12 = -16, r12  /* allocate a scratch area on the stack */
+        #
+        # Initialize memory stack to some sane value and allocate a scratch are
+        # on it.
+        #
+        movl sp = stack0 ;;
+        add sp = -16, sp
         
         # Initialize gp (Global Pointer) register
+        movl gp = kernel_image_start
+        
+        #       
+        # Initialize bootinfo on BSP.
+        #
         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
-        or r20 = r20, r1 ;;
-        movl r1 = kernel_image_start
-        
-        /*
-         * Initialize bootinfo on BSP.
-         */
+        or r20 = r20, r2 ;;
         addl r21 = @gprel(bootinfo), gp ;;
         st8 [r21] = r20