X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/527f99514973766e9c0382a4d8550dfb00f54939..0a7de7458d150b5d4dffc935ba399be265ef0a1a:/config/MASTER?ds=sidebyside

diff --git a/config/MASTER b/config/MASTER
index d4561e50d..a4b109d11 100644
--- a/config/MASTER
+++ b/config/MASTER
@@ -1,7 +1,7 @@
 #
 # Mach Operating System
 # Copyright (c) 1986 Carnegie-Mellon University
-# Copyright 2001-2014 Apple Inc.
+# Copyright 2001-2018 Apple Inc.
 #
 # All rights reserved.  The CMU software License Agreement
 # specifies the terms and conditions for use and redistribution.
@@ -116,6 +116,7 @@ options		CONFIG_IMAGEBOOT	# local image boot	# <config_imageboot>
 options		CONFIG_MBUF_JUMBO	# jumbo cluster pool	# <config_mbuf_jumbo>
 
 options		CONFIG_WORKQUEUE	# <config_workqueue>
+options		CONFIG_WORKLOOP_DEBUG	# <config_workloop_debug>
 
 #
 #	4.4 filesystems 
@@ -141,6 +142,7 @@ options		CONFIG_TRIGGERS	# trigger vnodes		# <config_triggers>
 options		CONFIG_EXT_RESOLVER # e.g. memberd		# <config_ext_resolver>
 options		CONFIG_SEARCHFS	# searchfs syscall support	# <config_searchfs>
 options		CONFIG_MNT_SUID # allow suid binaries  # <config_mnt_suid>
+options		CONFIG_MNT_ROOTSNAP # allow rooting from snapshot # <config_mnt_rootsnap>
 
 #
 # NFS support
@@ -172,6 +174,8 @@ options			CRYPTO				# <ipsec,crypto>
 options			CRYPTO_SHA2			# <crypto_sha2>
 options			ENCRYPTED_SWAP			# <encrypted_swap>
 
+options			CONFIG_IMG4			# <config_img4>
+
 options		ZLIB	# inflate/deflate support	# <zlib>
 
 options		IF_BRIDGE				# <if_bridge>
@@ -303,9 +307,10 @@ options   CONFIG_NO_PRINTF_STRINGS		# <no_printf_str>
 options   CONFIG_NO_KPRINTF_STRINGS		# <no_kprintf_str>
 
 #
-# use finer-grained lock groups for the proc subsystem
+# configurable kernel - general switch to say we are building for an
+# embedded device
 #
-options   CONFIG_FINE_LOCK_GROUPS               # <medium,large,xlarge>
+options   CONFIG_EMBEDDED			# <config_embedded>
 
 
 # support dynamic signing of code
@@ -326,6 +331,9 @@ options		CONFIG_CODE_DECRYPTION		# <config_code_decryption>
 #
 options		CONFIG_PROTECT			# <config_protect>
 
+#allow write-protection of key page
+options		CONFIG_KEYPAGE_WP		# <config_keypage_wp>
+
 #
 # enable per-process memory priority tracking
 #
@@ -371,6 +379,11 @@ options		CONFIG_SECLUDED_MEMORY		# <config_secluded_memory>
 
 options		CONFIG_BACKGROUND_QUEUE		# <config_background_queue>
 
+#
+# Ledger features
+#
+options		CONFIG_LEDGER_INTERVAL_MAX	# <config_ledger_interval_max>
+
 #
 # I/O Scheduling
 #
@@ -453,6 +466,7 @@ pseudo-device	random		1	init	random_init
 pseudo-device	dtrace		1	init	dtrace_init	# <config_dtrace>
 pseudo-device	helper		1	init	helper_init	# <config_dtrace>
 pseudo-device	lockstat	1	init	lockstat_init	# <config_dtrace>
+pseudo-device	lockprof	1	init	lockprof_init	# <config_dtrace>
 pseudo-device	sdt		1	init	sdt_init	# <config_dtrace>
 pseudo-device	systrace	1	init	systrace_init	# <config_dtrace>
 pseudo-device	fbt		1	init	fbt_init	# <config_dtrace>
@@ -477,6 +491,7 @@ options         NO_KERNEL_HID           		# <no_kernel_hid>
 #
 
 options		LIBKERNCPP		# C++ implementation	# <libkerncpp>
+options		CONFIG_BLOCKS		# Blocks runtime	# <config_blocks>
 options		CONFIG_KXLD		# kxld/runtime linking of kexts # <config_kxld>
 options		CONFIG_KEC_FIPS		# Kernel External Components for FIPS compliance (KEC_FIPS) # <config_kec_fips>
 
@@ -554,7 +569,7 @@ options		MACH_MP_DEBUG	#				# <debug>
 #	operations on each element.
 #
 options		ZONE_DEBUG	#		# <debug>
-
+options		CONFIG_ZCACHE 	#Enable per-cpu caching for zones	# <config_zcache>
 options		CONFIG_ZLEAKS	# Live zone leak debugging	# <zleaks>
 
 #
@@ -596,6 +611,8 @@ options		NO_KDEBUG       	# no kernel tracing 	# <no_kdebug>
 #
 options		CONFIG_DTRACE		#		    # <config_dtrace>
 
+options		LOCK_STATS		#		    # <lock_stats>
+
 # kernel performance tracing
 options     KPERF                  # <kperf>
 options     KPC                    # <kpc>
@@ -647,9 +664,10 @@ options   CONFIG_TASK_MAX=1024			# <medium,large,xlarge>
 options   CONFIG_TASK_MAX=768			# <small,>
 options   CONFIG_TASK_MAX=512			# <xsmall,bsmall>
 
-options   CONFIG_ZONE_MAP_MIN=12582912	# <medium,large,xlarge>
-options   CONFIG_ZONE_MAP_MIN=6291456	# <small>
-options   CONFIG_ZONE_MAP_MIN=1048576	# <xsmall,bsmall>
+#
+# Minimum zone map size: 115 MB
+#
+options   CONFIG_ZONE_MAP_MIN=120586240	# <xsmall,bsmall,small,medium,large,xlarge>
 
 # Sizes must be a power of two for the zhash to 
 # be able to just mask off bits instead of mod 
@@ -735,8 +753,16 @@ options		CONFIG_REQUIRES_U32_MUNGING	# incoming U32 argument structures must be
 #
 options		COPYOUT_SHIM			# Shim for copyout memory analysis via kext #<copyout_shim>
 
+#
+# Enable hardware correlation of mach absolute time 
+# across intel/arm boundary
+options		CONFIG_MACH_BRIDGE_SEND_TIME #  # <config_mach_bridge_send_time>
+options		CONFIG_MACH_BRIDGE_RECV_TIME #  # <config_mach_bridge_recv_time>
 
 #
 # Telemetry for 32-bit process launch
 #
 options		CONFIG_32BIT_TELEMETRY # # <config_32bit_telemetry>
+
+options		CONFIG_QUIESCE_COUNTER # Support for _COMM_PAGE_CPU_QUIESCENT_COUNTER # <config_quiesce_counter>
+