Changeset 6688cc1 in mainline for kernel/arch/ia64/src/start.S

Timestamp:

2009-09-14T14:26:01Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ec8bab59

Parents:

c35aabe (diff), 19b5929 (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 fix for ticket #113.

File:

• kernel/arch/ia64/src/start.S (modified) (1 diff)

kernel/arch/ia64/src/start.S

@@ -186 +186 @@
         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
         or r20 = r20, r1 ;;
-        movl r1 = _hardcoded_load_address
+        movl r1 = kernel_image_start
         
         /*
-         * Initialize hardcoded_* variables. Do only BSP
+         * Initialize bootinfo on BSP.
          */
-(p3)    movl r14 = _hardcoded_ktext_size
-(p3)    movl r15 = _hardcoded_kdata_size
-(p3)    movl r16 = _hardcoded_load_address ;;
-(p3)    addl r17 = @gprel(hardcoded_ktext_size), gp
-(p3)    addl r18 = @gprel(hardcoded_kdata_size), gp
-(p3)    addl r19 = @gprel(hardcoded_load_address), gp
-(p3)    addl r21 = @gprel(bootinfo), gp
-                ;;
-(p3)    st8 [r17] = r14
-(p3)    st8 [r18] = r15
-(p3)    st8 [r19] = r16
+(p3)    addl r21 = @gprel(bootinfo), gp ;;
 (p3)    st8 [r21] = r20