Changeset 96e01fbc in mainline for uspace/lib/c/arch/arm32/src/fibril.S

Timestamp:

2012-08-31T17:30:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2be2506a

Parents:

e0d5bc5 (diff), 0d57c3e (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:

• uspace/lib/c/arch/arm32/src/fibril.S (modified) (2 diffs)

uspace/lib/c/arch/arm32/src/fibril.S

@@ -35 +35 @@
         stmia r0!, {sp, lr}
         stmia r0!, {r4-r11}
-
+        
         # return 1
         mov r0, #1
@@ -43 +43 @@
         ldmia r0!, {sp, lr}
         ldmia r0!, {r4-r11}
-
-        #return 0
+        
+        # return 0
         mov r0, #0
         mov pc, lr