Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (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.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/thread/fibril.c

    r7f7817a9 rab936440  
    550550                return 0;
    551551
    552         fibril->stack_size = (stksz == FIBRIL_DFLT_STK_SIZE) ?
    553             stack_size_get() : stksz;
     552        fibril->stack_size = stksz;
    554553        fibril->stack = as_area_create(AS_AREA_ANY, fibril->stack_size,
    555554            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
     
    572571        context_create(&fibril->ctx, &sctx);
    573572        return (fid_t) fibril;
     573}
     574
     575fid_t fibril_create(errno_t (*func)(void *), void *arg)
     576{
     577        return fibril_create_generic(func, arg, stack_size_get());
    574578}
    575579
Note: See TracChangeset for help on using the changeset viewer.