X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=config%2FConfig-kernel.in;h=53bdc26eef574ea625164ec097911b9d049c0a27;hp=a475e9aae21e15bee10e8bdd656cd19a074fb549;hb=7a0d6541e6353d6a4581bfed9290ebf6922c9b40;hpb=f26596fc3e9b555dcbbb0aae4ce43c7e39c1c47b

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index a475e9aae2..53bdc26eef 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -10,7 +10,7 @@ config KERNEL_PRINTK
 
 config KERNEL_CRASHLOG
 	bool "Crash logging"
-	depends on !(arm || powerpc || sparc)
+	depends on !(arm || powerpc || sparc || TARGET_uml)
 	default y
 
 config KERNEL_SWAP
@@ -134,6 +134,20 @@ config KERNEL_PRINTK_TIME
 	bool "Enable printk timestamps"
 	default y
 
+config KERNEL_SLUB_DEBUG
+	bool
+
+config KERNEL_SLUB_DEBUG_ON
+	bool
+
+config KERNEL_SLABINFO
+	select KERNEL_SLUB_DEBUG
+	select KERNEL_SLUB_DEBUG_ON
+	bool "Enable /proc slab debug info"
+
+config KERNEL_PROC_PAGE_MONITOR
+	bool "Enable /proc page monitoring"
+
 config KERNEL_RELAY
 	bool
 
@@ -144,6 +158,10 @@ config USE_RFKILL
 	bool "Enable rfkill support"
 	default RFKILL_SUPPORT
 
+config USE_SPARSE
+	bool "Enable sparse check during kernel build"
+	default n
+
 #
 # CGROUP support symbols
 #
@@ -168,7 +186,7 @@ if KERNEL_CGROUPS
 
 	config KERNEL_CGROUP_FREEZER
 		bool "Freezer cgroup subsystem"
-		default n
+		default y
 		help
 		  Provides a way to freeze and unfreeze all tasks in a
 		  cgroup.
@@ -281,12 +299,9 @@ if KERNEL_CGROUPS
 		  the kmem extension can use it to guarantee that no group of processes
 		  will ever exhaust kernel resources alone.
 
-	config KERNEL_PERF_EVENTS
-		bool
-		default y if KERNEL_CGROUP_PERF
-
 	config KERNEL_CGROUP_PERF
 		bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+		select KERNEL_PERF_EVENTS
 		default n
 		help
 		  This option extends the per-cpu mode to restrict monitoring to