Changeset 09b859c in mainline for kernel/generic/src/sysinfo/sysinfo.c


Ignore:
Timestamp:
2010-07-07T18:37:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
77385fe
Parents:
e2ea4ab1 (diff), 22c3444 (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 from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/sysinfo/sysinfo.c

    re2ea4ab1 r09b859c  
    5858 *
    5959 */
    60 static int sysinfo_item_constructor(void *obj, unsigned int kmflag)
     60NO_TRACE static int sysinfo_item_constructor(void *obj, unsigned int kmflag)
    6161{
    6262        sysinfo_item_t *item = (sysinfo_item_t *) obj;
     
    7878 *
    7979 */
    80 static size_t sysinfo_item_destructor(void *obj)
     80NO_TRACE static size_t sysinfo_item_destructor(void *obj)
    8181{
    8282        sysinfo_item_t *item = (sysinfo_item_t *) obj;
     
    120120 *
    121121 */
    122 static sysinfo_item_t *sysinfo_find_item(const char *name,
     122NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
    123123    sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
    124124{
     
    180180 *
    181181 */
    182 static sysinfo_item_t *sysinfo_create_path(const char *name,
     182NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
    183183    sysinfo_item_t **psubtree)
    184184{
     
    458458 *
    459459 */
    460 static void sysinfo_indent(unsigned int depth)
     460NO_TRACE static void sysinfo_indent(unsigned int depth)
    461461{
    462462        unsigned int i;
     
    473473 *
    474474 */
    475 static void sysinfo_dump_internal(sysinfo_item_t *root, unsigned int depth)
     475NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, unsigned int depth)
    476476{
    477477        sysinfo_item_t *cur = root;
     
    567567 *
    568568 */
    569 static sysinfo_return_t sysinfo_get_item(const char *name,
     569NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
    570570    sysinfo_item_t **root, bool dry_run)
    571571{
     
    622622 *
    623623 */
    624 static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     624NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
    625625    bool dry_run)
    626626{
Note: See TracChangeset for help on using the changeset viewer.