xnu-3248.30.4.tar.gz

[apple/xnu.git] / osfmk / kern / zalloc.h

diff --git a/osfmk/kern/zalloc.h b/osfmk/kern/zalloc.h
index 6210bd62fcb6fb4b7088fe280a5dcc45a4afa7a5..5446890558b3bc59a3c7607cbbdb3ee662240373 100644 (file)
--- a/osfmk/kern/zalloc.h
+++ b/osfmk/kern/zalloc.h
@@ -120,7 +120,8 @@ struct zone {
        /* boolean_t */ collectable        :1,  /* (F) garbage collect empty pages */
        /* boolean_t */ expandable         :1,  /* (T) expand zone (with message)? */
        /* boolean_t */ allows_foreign     :1,  /* (F) allow non-zalloc space */
        /* boolean_t */ collectable        :1,  /* (F) garbage collect empty pages */
        /* boolean_t */ expandable         :1,  /* (T) expand zone (with message)? */
        /* boolean_t */ allows_foreign     :1,  /* (F) allow non-zalloc space */

-       /* boolean_t */ doing_alloc        :1,  /* is zone expanding now? */
+       /* boolean_t */ doing_alloc_without_vm_priv:1,  /* is zone expanding now via a non-vm_privileged thread? */
+       /* boolean_t */ doing_alloc_with_vm_priv:1, /* is zone expanding now via a vm_privileged thread? */

        /* boolean_t */ waiting            :1,  /* is thread waiting for expansion? */
        /* boolean_t */ async_pending      :1,  /* asynchronous allocation pending? */
        /* boolean_t */ zleak_on           :1,  /* Are we collecting allocation information? */
        /* boolean_t */ waiting            :1,  /* is thread waiting for expansion? */
        /* boolean_t */ async_pending      :1,  /* asynchronous allocation pending? */
        /* boolean_t */ zleak_on           :1,  /* Are we collecting allocation information? */


@@ -132,7 +133,7 @@ struct zone {
        /* boolean_t */ gzalloc_exempt     :1,
        /* boolean_t */ alignment_required :1,
        /* boolean_t */ use_page_list      :1,
        /* boolean_t */ gzalloc_exempt     :1,
        /* boolean_t */ alignment_required :1,
        /* boolean_t */ use_page_list      :1,

-       /* future    */ _reserved          :16;
+       /* future    */ _reserved          :15;

 
        int             index;          /* index into zone_info arrays for this zone */
        struct zone     *next_zone;     /* Link for all-zones list */
 
        int             index;          /* index into zone_info arrays for this zone */
        struct zone     *next_zone;     /* Link for all-zones list */