X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/593a1d5fd87cdf5b46dd5fcb84467b432cea0f91..b7266188b87f3620ec3f9f717e57194a7dd989fe:/osfmk/conf/MASTER

diff --git a/osfmk/conf/MASTER b/osfmk/conf/MASTER
index 08c28268c..cadb1a976 100644
--- a/osfmk/conf/MASTER
+++ b/osfmk/conf/MASTER
@@ -141,7 +141,6 @@ options		CONFIG_DTRACE	#		# <config_dtrace>
 # 
 options		MACH_COUNTERS	#		# <debug>
 
-options		UPL_DEBUG	# 		# <debug>
 
 ##########################################################
 #
@@ -188,6 +187,10 @@ options		CRYPTO                  # <crypto>
 #
 options		HIBERNATION		#		# <hibernation>
 
+# CONFIG_SLEEP - include sleep power state code
+#
+options		CONFIG_SLEEP		#		# <config_sleep>
+
 #
 #  configurable kernel related resources (CONFIG_THREAD_MAX needs to stay in 
 #  sync with bsd/conf/MASTER until we fix the config system... todo XXX
@@ -227,8 +230,9 @@ options   CONFIG_EMBEDDED                       # <config_embedded>
 #
 options   CONFIG_ENFORCE_SIGNED_CODE		# <config_embedded>
 
-#  jettison_kernel_linker - jettison kernel linker after kernel init; don't wait for kextd to launch
-options   CONFIG_JETTISON_KERNEL_LINKER		# <jettison_kernel_linker>
+# support dynamic signing of code
+#
+options		CONFIG_DYNAMIC_CODE_SIGNING	# <dynamic_codesigning>
 
 # vc_progress_white - make the progress gear white instead of black
 options	  CONFIG_VC_PROGRESS_WHITE		# <vc_progress_white>
@@ -241,3 +245,8 @@ options		SECURE_KERNEL		# <secure_kernel>
 # must be set in all the bsd/conf and osfmk/conf MASTER files
 #
 options		CONFIG_CODE_DECRYPTION	# <config_embedded>
+
+#
+# Context switched counters 
+#
+options		CONFIG_COUNTERS			# <config_counters>