From eb3a0026d584ec29ab18f39b1ed789238c0448f9 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Tue, 26 Oct 2010 14:23:05 -0700
Subject: [PATCH] --- yaml --- r: 217572 b: refs/heads/master c:
 6d411e6c01608cefb7b9ea6712110538a1432f9f h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/lib/Kconfig.debug | 9 +++++++++
 trunk/lib/list_sort.c   | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3cb3f667ec4b..bfb6d93f7940 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2852ae825dba5ebc159788720baec1a28a57125
+refs/heads/master: 6d411e6c01608cefb7b9ea6712110538a1432f9f
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 0d5c762532a5..95bda87a3e84 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -748,6 +748,15 @@ config DEBUG_LIST
 
 	  If unsure, say N.
 
+config TEST_LIST_SORT
+	bool "Linked list sorting test"
+	depends on DEBUG_KERNEL
+	help
+	  Enable this to turn on 'list_sort()' function test. This test is
+	  executed only once during system boot, so affects only boot time.
+
+	  If unsure, say N.
+
 config DEBUG_SG
 	bool "Debug SG table operations"
 	depends on DEBUG_KERNEL
diff --git a/trunk/lib/list_sort.c b/trunk/lib/list_sort.c
index a7616fa3162e..827794016bfb 100644
--- a/trunk/lib/list_sort.c
+++ b/trunk/lib/list_sort.c
@@ -141,7 +141,7 @@ void list_sort(void *priv, struct list_head *head,
 }
 EXPORT_SYMBOL(list_sort);
 
-#ifdef DEBUG_LIST_SORT
+#ifdef CONFIG_TEST_LIST_SORT
 struct debug_el {
 	struct list_head l_h;
 	int value;
@@ -214,4 +214,4 @@ static int __init list_sort_test(void)
 	return 0;
 }
 module_init(list_sort_test);
-#endif
+#endif /* CONFIG_TEST_LIST_SORT */