Changeset 92574f4 in mainline for uspace/lib/c/arch/ppc32/src/entry.s

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/arch/ppc32/src/entry.s (modified) (1 diff)

uspace/lib/c/arch/ppc32/src/entry.s

@@ -44 +44 @@
         stw %r3, 0(%r1)
         stwu %r1, -16(%r1)
-
+        
         # Pass the PCB pointer to __main() as the first argument.
         # The first argument is passed in r3.
         mr %r3, %r6
         bl __main
-
-        bl __exit