summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 09:08:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 09:08:29 -0800
commitacda4721ae876dedab3fef04bbd8020bfa67ff0a (patch)
treeec48d554fe48b3915912e2ae62bc962ade0553bd /include
parent822e5215f9eef86c1dd56d5696bf55a212b0e3f0 (diff)
parent32385c7cf60a78375b63afc4f02001df84dfd1a0 (diff)
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: kernel: fix hlist_bl again cgroups: Fix a lockdep warning at cgroup removal fs: namei fix ->put_link on wrong inode in do_filp_open
Diffstat (limited to 'include')
-rw-r--r--include/linux/list_bl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
index b2adbb4b2f7..5bad17d1acd 100644
--- a/include/linux/list_bl.h
+++ b/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