27c27
< * $FreeBSD: head/sys/vm/uma_int.h 249312 2013-04-09 17:25:15Z glebius $
---
> * $FreeBSD: head/sys/vm/uma_int.h 249313 2013-04-09 17:43:48Z glebius $
187,188c187,188
< u_int64_t uc_allocs; /* Count of allocations */
< u_int64_t uc_frees; /* Count of frees */
---
> uint64_t uc_allocs; /* Count of allocations */
> uint64_t uc_frees; /* Count of frees */
208,214c208,214
< u_int32_t uk_recurse; /* Allocation recursion count */
< u_int32_t uk_align; /* Alignment mask */
< u_int32_t uk_pages; /* Total page count */
< u_int32_t uk_free; /* Count of items free in slabs */
< u_int32_t uk_size; /* Requested size of each item */
< u_int32_t uk_rsize; /* Real size of each item */
< u_int32_t uk_maxpages; /* Maximum number of pages to alloc */
---
> uint32_t uk_recurse; /* Allocation recursion count */
> uint32_t uk_align; /* Alignment mask */
> uint32_t uk_pages; /* Total page count */
> uint32_t uk_free; /* Count of items free in slabs */
> uint32_t uk_size; /* Requested size of each item */
> uint32_t uk_rsize; /* Real size of each item */
> uint32_t uk_maxpages; /* Maximum number of pages to alloc */
225,229c225,229
< u_int16_t uk_slabsize; /* Slab size for this keg */
< u_int16_t uk_pgoff; /* Offset to uma_slab struct */
< u_int16_t uk_ppera; /* pages per allocation from backend */
< u_int16_t uk_ipers; /* Items per slab */
< u_int32_t uk_flags; /* Internal flags */
---
> uint16_t uk_slabsize; /* Slab size for this keg */
> uint16_t uk_pgoff; /* Offset to uma_slab struct */
> uint16_t uk_ppera; /* pages per allocation from backend */
> uint16_t uk_ipers; /* Items per slab */
> uint32_t uk_flags; /* Internal flags */
247,250c247,250
< u_int8_t *us_data; /* First item */
< u_int16_t us_freecount; /* How many are free? */
< u_int8_t us_flags; /* Page flags see uma.h */
< u_int8_t us_firstfree; /* First free item index */
---
> uint8_t *us_data; /* First item */
> uint16_t us_freecount; /* How many are free? */
> uint8_t us_flags; /* Page flags see uma.h */
> uint8_t us_firstfree; /* First free item index */
257c257
< u_int8_t us_item;
---
> uint8_t us_item;
268,269c268,269
< u_int8_t us_item;
< u_int32_t us_refcnt;
---
> uint8_t us_item;
> uint32_t us_refcnt;
326,327c326,327
< u_int32_t uz_flags; /* Flags inherited from kegs */
< u_int32_t uz_size; /* Size inherited from kegs */
---
> uint32_t uz_flags; /* Flags inherited from kegs */
> uint32_t uz_size; /* Size inherited from kegs */
329,332c329,332
< u_int64_t uz_allocs UMA_ALIGN; /* Total number of allocations */
< u_int64_t uz_frees; /* Total number of frees */
< u_int64_t uz_fails; /* Total number of alloc failures */
< u_int64_t uz_sleeps; /* Total number of alloc sleeps */
---
> uint64_t uz_allocs UMA_ALIGN; /* Total number of allocations */
> uint64_t uz_frees; /* Total number of frees */
> uint64_t uz_fails; /* Total number of alloc failures */
> uint64_t uz_sleeps; /* Total number of alloc sleeps */
365c365
< static __inline uma_slab_t hash_sfind(struct uma_hash *hash, u_int8_t *data);
---
> static __inline uma_slab_t hash_sfind(struct uma_hash *hash, uint8_t *data);
399c399
< hash_sfind(struct uma_hash *hash, u_int8_t *data)
---
> hash_sfind(struct uma_hash *hash, uint8_t *data)
407c407
< if ((u_int8_t *)slab->us_data == data)
---
> if ((uint8_t *)slab->us_data == data)
453,454c453,454
< void *uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait);
< void uma_small_free(void *mem, int size, u_int8_t flags);
---
> void *uma_small_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait);
> void uma_small_free(void *mem, int size, uint8_t flags);