Changeset 7aaed09 in mainline for kernel/arch/ia64/src/start.S

Timestamp:

2011-12-18T14:02:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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

@@ -174 +174 @@
         mov ar.bspstore = r8
         loadrs
-
+        
         #
         # Initialize memory stack to some sane value and allocate a scratch area
@@ -196 +196 @@
         srlz.i
         srlz.d ;;
-
+        
         br.call.sptk.many b0 = arch_pre_main
 0: