Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/mm/slab.h

    r273b958 r98000fb  
    8484} slab_mag_cache_t;
    8585
     86
    8687typedef struct {
    87         const char *name;
     88        char *name;
    8889       
    8990        link_t link;
    … …  
    9394        size_t size;
    9495       
    95         int (*constructor)(void *obj, unsigned int kmflag);
    96         size_t (*destructor)(void *obj);
     96        int (*constructor)(void *obj, int kmflag);
     97        int (*destructor)(void *obj);
    9798       
    9899        /** Flags changing behaviour of cache */
    99         unsigned int flags;
     100        int flags;
    100101       
    101102        /* Computed values */
    102         uint8_t order;   /**< Order of frames to be allocated */
    103         size_t objects;  /**< Number of objects that fit in */
     103        uint8_t order;         /**< Order of frames to be allocated */
     104        unsigned int objects;  /**< Number of objects that fit in */
    104105       
    105106        /* Statistics */
    … …  
    108109        atomic_t cached_objs;
    109110        /** How many magazines in magazines list */
    110         atomic_t magazine_counter;
     111        atomic_t magazine_counter; 
    111112       
    112113        /* Slabs */
    … …  
    122123} slab_cache_t;
    123124
    124 extern slab_cache_t *slab_cache_create(const char *, size_t, size_t,
    125     int (*)(void *, unsigned int), size_t (*)(void *), unsigned int);
     125extern slab_cache_t *slab_cache_create(char *, size_t, size_t,
     126    int (*)(void *, int), int (*)(void *), int);
    126127extern void slab_cache_destroy(slab_cache_t *);
    127128
    128 extern void *slab_alloc(slab_cache_t *, unsigned int)
    129     __attribute__((malloc));
     129extern void * slab_alloc(slab_cache_t *, int);
    130130extern void slab_free(slab_cache_t *, void *);
    131 extern size_t slab_reclaim(unsigned int);
     131extern size_t slab_reclaim(int);
    132132
    133133/* slab subsytem initialization */
    … …  
    139139
    140140/* malloc support */
    141 extern void *malloc(size_t, unsigned int)
    142     __attribute__((malloc));
    143 extern void *realloc(void *, size_t, unsigned int);
     141extern void *malloc(unsigned int, int);
     142extern void *realloc(void *, unsigned int, int);
    144143extern void free(void *);
    145144
Note: See TracChangeset for help on using the changeset viewer.