Changeset 11b285d in mainline for kernel/generic/src/mm/slab.c
- Timestamp:
- 2018-05-13T15:19:32Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ad896eb
- Parents:
- 13db2044
- git-author:
- Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 14:59:01)
- git-committer:
- Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 15:19:32)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/mm/slab.c
r13db2044 r11b285d 954 954 } 955 955 956 void *malloc(size_t size, unsigned int flags)956 static void *_malloc(size_t size, unsigned int flags) 957 957 { 958 958 assert(_slab_initialized); … … 967 967 } 968 968 969 void *realloc(void *ptr, size_t size, unsigned int flags) 969 void *malloc(size_t size) 970 { 971 return _malloc(size, FRAME_ATOMIC); 972 } 973 974 /** Non-failing malloc. 975 * Never returns NULL, but may block forever if no memory is available. 976 */ 977 void *nfmalloc(size_t size) 978 { 979 return _malloc(size, 0); 980 } 981 982 static void *_realloc(void *ptr, size_t size, unsigned int flags) 970 983 { 971 984 assert(_slab_initialized); … … 994 1007 } 995 1008 1009 void *realloc(void *ptr, size_t size) 1010 { 1011 return _realloc(ptr, size, FRAME_ATOMIC); 1012 } 1013 996 1014 void free(void *ptr) 997 1015 {
Note:
See TracChangeset
for help on using the changeset viewer.