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

Timestamp:

2011-02-24T12:03:27Z (13 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/sparc64/src/entry.s (modified) (2 diffs)

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

@@ -45 +45 @@
         flushw
         add %g0, -0x7ff, %fp
-
+        
         # Pass pcb_ptr as the first argument to __main()
         mov %i1, %o0
@@ -51 +51 @@
         call __main
         or %l7, %lo(_gp), %l7
-
-        call __exit
-        nop