From f05a02ae91c5f0a866441e9e8ac257a9bcef2089 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 14 Jan 2011 13:12:45 +0000
Subject: [PATCH] --- yaml --- r: 231039 b: refs/heads/master c:
 32385c7cf60a78375b63afc4f02001df84dfd1a0 h: refs/heads/master i:   231037:
 f33de9917bc8ef306253f45433fce31b1d95563d   231035:
 7243c269d3bb26d5f39f19519f384f0ee210fd8f   231031:
 273f81b944a7ea462a6040c0e140038c6ea18972   231023:
 f46eb2c4c72c7e90ab810f3e7d3fe5f3e384dca2   231007:
 57c27e69af90cf5c056056bc7fdbec30f02bb30f   230975:
 6f5c78123c1e470f8e2504394201302014d444e5   230911:
 a954a1a4da24511f074efa4beef4fd8f4d5f29f3 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/list_bl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 32f8d8a0aad4..aedb3117f538 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54
+refs/heads/master: 32385c7cf60a78375b63afc4f02001df84dfd1a0
diff --git a/trunk/include/linux/list_bl.h b/trunk/include/linux/list_bl.h
index b2adbb4b2f73..5bad17d1acde 100644
--- a/trunk/include/linux/list_bl.h
+++ b/trunk/include/linux/list_bl.h
@@ -16,7 +16,7 @@
  * some fast and compact auxiliary data.
  */
 
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
 #define LIST_BL_LOCKMASK	1UL
 #else
 #define LIST_BL_LOCKMASK	0UL