--- zzzz-none-000/linux-4.4.60/lib/Kconfig.debug	2017-04-08 07:53:53.000000000 +0000
+++ scorpion-7490-727/linux-4.4.60/lib/Kconfig.debug	2021-02-04 17:41:59.000000000 +0000
@@ -445,6 +445,12 @@
 	  percpu counter routines to track the life time of percpu counter
 	  objects and validate the percpu counter operations.
 
+config DEBUG_OBJECTS_SKBUFF
+	bool "Debug sk_buff allocations"
+	depends on DEBUG_OBJECTS
+	help
+	  Enable this to turn on debugging of sk_buff's (incl. recycler)
+
 config DEBUG_OBJECTS_ENABLE_DEFAULT
 	int "debug_objects bootup default value (0-1)"
         range 0 1
@@ -461,6 +467,23 @@
 	  allocation as well as poisoning memory on free to catch use of freed
 	  memory. This can make kmalloc/kfree-intensive workloads much slower.
 
+config DEBUG_SLAB_DOUBLE_FREE
+	bool "SLAB double free check enabled"
+	depends on DEBUG_KERNEL && SLAB && !DEBUG_SLAB
+	default y
+	help
+	  Say Y here if you hit BUG or BUG_ON in slab.c, to find the problem.
+	  This makes kmalloc/kfree-intensive workloads only a little bit slower.
+
+config DEBUG_SLAB_AVM_LITE
+
+	bool "SLAB store caller and time for memoryleak-analyzing on oom"
+	depends on DEBUG_KERNEL && SLAB &&  DEBUG_SLAB_DOUBLE_FREE && AVM_KERNEL
+	default y
+	help
+	  Say Y if you want per-caller-and-time-history for kmallocs
+	  the overhead (cpu-run/memory) is VERY small
+
 config DEBUG_SLAB_LEAK
 	bool "Memory leak debugging"
 	depends on DEBUG_SLAB
@@ -1853,3 +1876,37 @@
 
 source "lib/Kconfig.kgdb"
 
+config STOPWATCH
+	bool
+	prompt "API to measure time elapsed between two events"
+	default n
+	help
+	  This feature provides APIs to measure time elaspsed between any two
+	  events with nanosecond precision. Multiple samples can be collected
+	  by calling the STOPWATCH_(START/STOP) APIs.  The min, avg and max
+	  values of all the samples can be viewed at /proc/stopwatch/<event>.
+	  The counters are reset everytime the file is viewed.
+
+	  If in doubt, say N here.
+
+config STOPWATCH_SOFT_IRQ
+	bool
+	depends on STOPWATCH
+	prompt "Measure soft IRQ processing time using stopwatch"
+	default n
+	help
+	  Measure the time taken to process each soft IRQ.
+	  The values can be viewed at /proc/stopwatch/softirq
+
+	  If in doubt, say N here.
+
+config STOPWATCH_HARD_IRQ
+	bool
+	depends on STOPWATCH
+	prompt "Measure hard IRQ processing time using stopwatch"
+	default n
+	help
+	  Measure the time taken to process each hard IRQ.
+	  The values can be viewed at /proc/stopwatch/hardirq
+
+	  If in doubt, say N here.