X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=config%2FConfig-kernel.in;h=a4a45b4048c86c41b651c8e12ba9eadcc8c53b20;hb=53557b1ac1f2875b10516422e0c3aaa01f48ea30;hp=c2539595084131c963bc5676c183e94b3278dcdf;hpb=8f3a1a27b7de2d8e6fa6bb889bc48a41990ef61e;p=openwrt-github%2F.git

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index c253959508..a4a45b4048 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -1,9 +1,22 @@
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
+config KERNEL_PRINTK
+	bool "Enable support for printk"
+	default y
+
+config KERNEL_CRASHLOG
+	bool "Crash logging"
+	depends on !(arm || powerpc || sparc)
+	default y
+
+config KERNEL_SWAP
+	bool "Support for paging of anonymous memory (swap)"
+	default y
+
 config KERNEL_DEBUG_FS
 	bool "Compile the kernel with Debug FileSystem enabled"
 	default y
@@ -121,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
 
@@ -131,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
 #
@@ -268,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