Changeset db71e2a in mainline for uspace/lib/c/arch/ppc32/src/tls.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

uspace/lib/c/arch/ppc32/src/tls.c

@@ -36 +36 @@
 #include <sys/types.h>
 
-tcb_t * __alloc_tls(void **data, size_t size)
+tcb_t *tls_alloc_arch(void **data, size_t size)
 {
         return tls_alloc_variant_1(data, size);
 }
 
-void __free_tls_arch(tcb_t *tcb, size_t size)
+void tls_free_arch(tcb_t *tcb, size_t size)
 {
         tls_free_variant_1(tcb, size);