xnu-1228.0.2.tar.gz

[apple/xnu.git] / osfmk / mach / vm_region.h

diff --git a/osfmk/mach/vm_region.h b/osfmk/mach/vm_region.h
index 3326507d58f029f6e02332fee2f2d9632ff20249..f8b8ec650ff42804a2153b1c4bfa662b6520e76e 100644 (file)
--- a/osfmk/mach/vm_region.h
+++ b/osfmk/mach/vm_region.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -50,9 +50,7 @@
 
 #include <sys/cdefs.h>
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 /*
  *     Types defined:
@@ -242,6 +240,29 @@ typedef struct vm_region_submap_info_64             vm_region_submap_info_data_64_t;
 #define VM_REGION_SUBMAP_INFO_COUNT_64         ((mach_msg_type_number_t) \
        (sizeof(vm_region_submap_info_data_64_t)/sizeof(int)))
 
+struct vm_region_submap_short_info_64 {
+       vm_prot_t               protection;     /* present access protection */
+       vm_prot_t               max_protection; /* max avail through vm_prot */
+       vm_inherit_t            inheritance;/* behavior of map/obj on fork */
+       memory_object_offset_t  offset;         /* offset into object/map */
+        unsigned int            user_tag;      /* user tag on map entry */
+        unsigned int            ref_count;      /* obj/map mappers, etc */
+        unsigned short          shadow_depth;  /* only for obj */
+        unsigned char           external_pager;  /* only for obj */
+        unsigned char           share_mode;    /* see enumeration */
+       boolean_t               is_submap;      /* submap vs obj */
+       vm_behavior_t           behavior;       /* access behavior hint */
+       vm_offset_t             object_id;      /* obj/map name, not a handle */
+       unsigned short          user_wired_count; 
+};
+
+typedef struct vm_region_submap_short_info_64  *vm_region_submap_short_info_64_t;
+typedef struct vm_region_submap_short_info_64   vm_region_submap_short_info_data_64_t;
+
+#define VM_REGION_SUBMAP_SHORT_INFO_COUNT_64   ((mach_msg_type_number_t) \
+       (sizeof(vm_region_submap_short_info_data_64_t)/sizeof(int)))
+
+
 struct mach_vm_read_entry {
        mach_vm_address_t address;
        mach_vm_size_t size;
@@ -257,8 +278,6 @@ struct vm_read_entry {
 typedef struct mach_vm_read_entry      mach_vm_read_entry_t[VM_MAP_ENTRY_MAX];
 typedef struct vm_read_entry           vm_read_entry_t[VM_MAP_ENTRY_MAX];
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 #endif /*_MACH_VM_REGION_H_*/