51c51
< __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 249305 2013-04-09 12:20:44Z glebius $");
---
> __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 249313 2013-04-09 17:43:48Z glebius $");
171c171
< u_int32_t flags;
---
> uint32_t flags;
180c180
< u_int32_t flags;
---
> uint32_t flags;
218,221c218,221
< static void *noobj_alloc(uma_zone_t, int, u_int8_t *, int);
< static void *page_alloc(uma_zone_t, int, u_int8_t *, int);
< static void *startup_alloc(uma_zone_t, int, u_int8_t *, int);
< static void page_free(void *, int, u_int8_t);
---
> static void *noobj_alloc(uma_zone_t, int, uint8_t *, int);
> static void *page_alloc(uma_zone_t, int, uint8_t *, int);
> static void *startup_alloc(uma_zone_t, int, uint8_t *, int);
> static void page_free(void *, int, uint8_t);
253c253
< uma_fini fini, int align, u_int32_t flags);
---
> uma_fini fini, int align, uint32_t flags);
698,699c698,699
< u_int8_t flags;
< u_int8_t *mem;
---
> uint8_t flags;
> uint8_t *mem;
831,832c831,832
< u_int8_t *mem;
< u_int8_t flags;
---
> uint8_t *mem;
> uint8_t flags;
953c953
< startup_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait)
---
> startup_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait)
1013c1013
< page_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait)
---
> page_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait)
1035c1035
< noobj_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
---
> noobj_alloc(uma_zone_t zone, int bytes, uint8_t *flags, int wait)
1098c1098
< page_free(void *mem, int size, u_int8_t flags)
---
> page_free(void *mem, int size, uint8_t flags)
1755,1756c1755,1756
< slab = (uma_slab_t)((u_int8_t *)bootmem + (i * UMA_SLAB_SIZE));
< slab->us_data = (u_int8_t *)slab;
---
> slab = (uma_slab_t)((uint8_t *)bootmem + (i * UMA_SLAB_SIZE));
> slab->us_data = (uint8_t *)slab;
1855c1855
< int align, u_int32_t flags)
---
> int align, uint32_t flags)
1880c1880
< uma_init uminit, uma_fini fini, int align, u_int32_t flags)
---
> uma_init uminit, uma_fini fini, int align, uint32_t flags)
2407c2407
< u_int8_t freei;
---
> uint8_t freei;
2811,2812c2811,2812
< u_int8_t *mem;
< u_int8_t freei;
---
> uint8_t *mem;
> uint8_t freei;
2829c2829
< mem = (u_int8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
---
> mem = (uint8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
3105c3105
< u_int32_t *
---
> uint32_t *
3110c3110
< u_int32_t *refcnt;
---
> uint32_t *refcnt;
3166c3166
< u_int8_t flags;
---
> uint8_t flags;
3270,3271c3270,3271
< uma_zone_sumstat(uma_zone_t z, int *cachefreep, u_int64_t *allocsp,
< u_int64_t *freesp, u_int64_t *sleepsp)
---
> uma_zone_sumstat(uma_zone_t z, int *cachefreep, uint64_t *allocsp,
> uint64_t *freesp, uint64_t *sleepsp)
3274c3274
< u_int64_t allocs, frees, sleeps;
---
> uint64_t allocs, frees, sleeps;
3425c3425
< u_int64_t allocs, frees, sleeps;
---
> uint64_t allocs, frees, sleeps;
< __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 249305 2013-04-09 12:20:44Z glebius $");
---
> __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 249313 2013-04-09 17:43:48Z glebius $");
171c171
< u_int32_t flags;
---
> uint32_t flags;
180c180
< u_int32_t flags;
---
> uint32_t flags;
218,221c218,221
< static void *noobj_alloc(uma_zone_t, int, u_int8_t *, int);
< static void *page_alloc(uma_zone_t, int, u_int8_t *, int);
< static void *startup_alloc(uma_zone_t, int, u_int8_t *, int);
< static void page_free(void *, int, u_int8_t);
---
> static void *noobj_alloc(uma_zone_t, int, uint8_t *, int);
> static void *page_alloc(uma_zone_t, int, uint8_t *, int);
> static void *startup_alloc(uma_zone_t, int, uint8_t *, int);
> static void page_free(void *, int, uint8_t);
253c253
< uma_fini fini, int align, u_int32_t flags);
---
> uma_fini fini, int align, uint32_t flags);
698,699c698,699
< u_int8_t flags;
< u_int8_t *mem;
---
> uint8_t flags;
> uint8_t *mem;
831,832c831,832
< u_int8_t *mem;
< u_int8_t flags;
---
> uint8_t *mem;
> uint8_t flags;
953c953
< startup_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait)
---
> startup_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait)
1013c1013
< page_alloc(uma_zone_t zone, int bytes, u_int8_t *pflag, int wait)
---
> page_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait)
1035c1035
< noobj_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
---
> noobj_alloc(uma_zone_t zone, int bytes, uint8_t *flags, int wait)
1098c1098
< page_free(void *mem, int size, u_int8_t flags)
---
> page_free(void *mem, int size, uint8_t flags)
1755,1756c1755,1756
< slab = (uma_slab_t)((u_int8_t *)bootmem + (i * UMA_SLAB_SIZE));
< slab->us_data = (u_int8_t *)slab;
---
> slab = (uma_slab_t)((uint8_t *)bootmem + (i * UMA_SLAB_SIZE));
> slab->us_data = (uint8_t *)slab;
1855c1855
< int align, u_int32_t flags)
---
> int align, uint32_t flags)
1880c1880
< uma_init uminit, uma_fini fini, int align, u_int32_t flags)
---
> uma_init uminit, uma_fini fini, int align, uint32_t flags)
2407c2407
< u_int8_t freei;
---
> uint8_t freei;
2811,2812c2811,2812
< u_int8_t *mem;
< u_int8_t freei;
---
> uint8_t *mem;
> uint8_t freei;
2829c2829
< mem = (u_int8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
---
> mem = (uint8_t *)((unsigned long)item & (~UMA_SLAB_MASK));
3105c3105
< u_int32_t *
---
> uint32_t *
3110c3110
< u_int32_t *refcnt;
---
> uint32_t *refcnt;
3166c3166
< u_int8_t flags;
---
> uint8_t flags;
3270,3271c3270,3271
< uma_zone_sumstat(uma_zone_t z, int *cachefreep, u_int64_t *allocsp,
< u_int64_t *freesp, u_int64_t *sleepsp)
---
> uma_zone_sumstat(uma_zone_t z, int *cachefreep, uint64_t *allocsp,
> uint64_t *freesp, uint64_t *sleepsp)
3274c3274
< u_int64_t allocs, frees, sleeps;
---
> uint64_t allocs, frees, sleeps;
3425c3425
< u_int64_t allocs, frees, sleeps;
---
> uint64_t allocs, frees, sleeps;