merge lib, kernel timer, remove unneeded bluetooth tizen and asm includes, disable mobicore

4 files changed, 17 insertions, 45 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 26af27a..dd373c8 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -10,23 +10,6 @@ config PRINTK_TIME
 	  in kernel startup.  Or add printk.time=1 at boot-time.
 	  See Documentation/kernel-parameters.txt
 
-config PRINTK_CPU_ID
-	bool "Show cpu id on printks"
-	depends on PRINTK
-	help
-	  Selecting this option causes current printk cpu id to be
-	  included in printk output. Or add printk.cpu=1 at boot-time.
-	  See Documentation/kernel-parameters.txt
-
-config PRINTK_PID
-        bool "Show pid on printks"
-        depends on PRINTK
-        help
-          Selecting this option causes current task's pid to be
-          included in printk output. Or add printk.pid=1 at boot-time.
-          This allows you to see the running process with kernel log.
-          See Documentation/kernel-parameters.txt
-
 config DEFAULT_MESSAGE_LOGLEVEL
 	int "Default message log level (1-7)"
 	range 1 7
@@ -684,9 +667,8 @@ config DEBUG_LOCKING_API_SELFTESTS
 	  mutexes and rwsems.
 
 config STACKTRACE
-	bool "Stacktrace"
+	bool
 	depends on STACKTRACE_SUPPORT
-	default y
 
 config DEBUG_STACK_USAGE
 	bool "Stack utilization instrumentation"
diff --git a/lib/list_debug.c b/lib/list_debug.c
index 50cac9e..b8029a5 100644
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -9,12 +9,6 @@
 #include <linux/module.h>
 #include <linux/list.h>
 
-#ifdef CONFIG_SEC_DEBUG_LIST_CORRUPTION
-static int list_debug = 0x00000100UL;
-#else
-static int list_debug;
-#endif
-
 /*
  * Insert a new entry between two known consecutive entries.
  *
@@ -26,20 +20,14 @@ void __list_add(struct list_head *new,
 			      struct list_head *prev,
 			      struct list_head *next)
 {
-	if (list_debug)
-		BUG_ON(next->prev != prev);
-	else
-		WARN(next->prev != prev,
-			"list_add corruption. next->prev should be "
-			"prev (%p), but was %p. (next=%p).\n",
-			prev, next->prev, next);
-	if (list_debug)
-		BUG_ON(prev->next != next);
-	else
-		WARN(prev->next != next,
-			"list_add corruption. prev->next should be "
-			"next (%p), but was %p. (prev=%p).\n",
-			next, prev->next, prev);
+	WARN(next->prev != prev,
+		"list_add corruption. next->prev should be "
+		"prev (%p), but was %p. (next=%p).\n",
+		prev, next->prev, next);
+	WARN(prev->next != next,
+		"list_add corruption. prev->next should be "
+		"next (%p), but was %p. (prev=%p).\n",
+		next, prev->next, prev);
 	next->prev = new;
 	new->next = next;
 	new->prev = prev;
@@ -65,11 +53,8 @@ void __list_del_entry(struct list_head *entry)
 		"but was %p\n", entry, prev->next) ||
 	    WARN(next->prev != entry,
 		"list_del corruption. next->prev should be %p, "
-		"but was %p\n", entry, next->prev)) {
-		if (list_debug)
-			BUG();
+		"but was %p\n", entry, next->prev))
 		return;
-	}
 
 	__list_del(prev, next);
 }
diff --git a/lib/plist.c b/lib/plist.c
index a0a4da4..0ae7e64 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -56,6 +56,11 @@ static void plist_check_list(struct list_head *top)
 
 static void plist_check_head(struct plist_head *head)
 {
+	WARN_ON(head != &test_head && !head->rawlock && !head->spinlock);
+	if (head->rawlock)
+		WARN_ON_SMP(!raw_spin_is_locked(head->rawlock));
+	if (head->spinlock)
+		WARN_ON_SMP(!spin_is_locked(head->spinlock));
 	if (!plist_head_empty(head))
 		plist_check_list(&plist_first(head)->prio_list);
 	plist_check_list(&head->node_list);
@@ -175,7 +180,7 @@ static int  __init plist_test(void)
 	unsigned int r = local_clock();
 
 	printk(KERN_INFO "start plist test\n");
-	plist_head_init(&test_head);
+	plist_head_init(&test_head, NULL);
 	for (i = 0; i < ARRAY_SIZE(test_node); i++)
 		plist_node_init(test_node + i, 0);
 
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index 1f8dfea..5696a35 100644
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -141,7 +141,7 @@ static unsigned int fsm_find(struct ts_config *conf, struct ts_state *state)
 	struct ts_fsm_token *cur = NULL, *next;
 	unsigned int match_start, block_idx = 0, tok_idx;
 	unsigned block_len = 0, strict, consumed = state->offset;
-	const u8 *data = NULL;
+	const u8 *data;
 
 #define GET_NEXT_BLOCK()		\
 ({	consumed += block_idx;		\