Add samsung specific changes

init/Kconfig

@@ -606,6 +606,26 @@ config TASKSTATS
 
 	  Say N if unsure.
 
+config MSM_SYSSTATS
+        tristate "Export system/task statistics through netlink"
+        depends on NET
+        depends on MULTIUSER
+        help
+          Export system and task statistics through generic netlink
+          interface. Userspace can retrieve these statistics via netlink
+          socket.
+          If unsure, say N
+
+config MSM_SYSSTATS_STUB_NONEXPORTED_SYMBOLS
+        bool "Stub out non-exported core-kernel symbols"
+        depends on MSM_SYSSTATS
+        help
+          Stub out is_system_dmabufheap(), vmalloc_nr_pages() and si_swapinfo().
+          Enabling this option will make the swap_used, swap_total and
+          vmalloc_total fields of struct sysstats_mem 0, and will make the
+          unreclaimable field either 0, or make it only include the KGSL memory.
+          If unsure, say N.
+
 config TASK_DELAY_ACCT
 	bool "Enable per-task delay accounting"
 	depends on TASKSTATS

init/init_task.c

@@ -12,7 +12,6 @@
 #include <linux/audit.h>
 #include <linux/numa.h>
 #include <linux/scs.h>
-#include <linux/task_integrity.h>
 
 #include <linux/uaccess.h>
 
@@ -58,11 +57,6 @@ unsigned long init_shadow_call_stack[SCS_SIZE / sizeof(long)]
 };
 #endif
 
-#ifdef CONFIG_FIVE
-static struct task_integrity init_integrity =
-					INIT_TASK_INTEGRITY(init_integrity);
-#endif
-
 /*
  * Set up the first task table, touch at your own risk!. Base=0,
  * limit=0x1fffff (=2MB)
@@ -220,7 +214,6 @@ struct task_struct init_task
 	.android_vendor_data1 = {0, },
 	.android_oem_data1 = {0, },
 #endif
-	INIT_INTEGRITY(init_task)
 };
 EXPORT_SYMBOL(init_task);
 

init/main.c

@@ -117,9 +117,8 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/initcall.h>
 
-#ifdef CONFIG_SECURITY_DEFEX
-#include <linux/defex.h>
-void __init __weak defex_load_rules(void) { }
+#if defined(CONFIG_KUNIT) && defined(CONFIG_CC_IS_GCC)
+#include <kunit/test.h>
 #endif
 
 static int kernel_init(void *);
@@ -1579,6 +1578,10 @@ static noinline void __init kernel_init_freeable(void)
 
 	do_basic_setup();
 
+#if defined(CONFIG_KUNIT) && defined(CONFIG_CC_IS_GCC)
+	kunit_run_all_tests();
+#endif
+
 	wait_for_initramfs();
 	console_on_rootfs();
 
@@ -1601,7 +1604,4 @@ static noinline void __init kernel_init_freeable(void)
 	 */
 
 	integrity_load_keys();
-#ifdef CONFIG_SECURITY_DEFEX
-	defex_load_rules();
-#endif
 }