--- zzzz-none-000/linux-2.6.39.4/init/Kconfig	2011-08-03 19:43:28.000000000 +0000
+++ puma6-atom-6490-729/linux-2.6.39.4/init/Kconfig	2021-11-10 13:38:18.000000000 +0000
@@ -71,7 +71,7 @@
 
 config INIT_ENV_ARG_LIMIT
 	int
-	default 32 if !UML
+	default 64 if !UML
 	default 128 if UML
 	help
 	  Maximum of each of the number of arguments and environment
@@ -384,6 +384,7 @@
 config TREE_PREEMPT_RCU
 	bool "Preemptible tree-based hierarchical RCU"
 	depends on PREEMPT
+	select PREEMPT_RCU
 	help
 	  This option selects the RCU implementation that is
 	  designed for very large SMP systems with hundreds or
@@ -394,6 +395,7 @@
 config TINY_RCU
 	bool "UP-only small-memory-footprint RCU"
 	depends on !SMP
+	select PREEMPT_RCU
 	help
 	  This option selects the RCU implementation that is
 	  designed for UP systems from which real-time response
@@ -411,7 +413,7 @@
 endchoice
 
 config PREEMPT_RCU
-	def_bool ( TREE_PREEMPT_RCU || TINY_PREEMPT_RCU )
+	bool
 	help
 	  This option enables preemptible-RCU code that is common between
 	  the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.
@@ -1273,6 +1275,16 @@
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
 
+config AVM_ENHANCED
+	bool "AVM collection of various enhanced kernel-features"
+	help
+	  Be aware: For compatibility reasons AVM_ENHANCED currently selects a
+	  list of other (smaller) AVM kernel enhancements.
+
+config AVM_SIMPLE_PROFILING
+    bool "Enable AVM Simple Profiling"
+    default n
+
 #
 # Place an empty function call at each tracepoint site. Can be
 # dynamically changed for a probe function.
@@ -1399,3 +1411,4 @@
 	bool
 
 source "kernel/Kconfig.locks"
+source "kernel/Kconfig.avm"