From 925d6646fd61f7d74fb1a5a38f490779d8623783 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Fri, 14 Jan 2011 02:36:43 +0000 Subject: [PATCH] --- yaml --- r: 230861 b: refs/heads/master c: 2c6755988afc003a0332406a134fb6a1626f9b28 h: refs/heads/master i: 230859: 824f4facbdce7886b5916b1f2c05843c0b989266 v: v3 --- [refs] | 2 +- trunk/include/linux/list_bl.h | 5 +++-- trunk/include/linux/rculist_bl.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ee85080d0bd0..22f1b6cf8536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90dbb77ba48dddb87445d238e84cd137cf97dd98 +refs/heads/master: 2c6755988afc003a0332406a134fb6a1626f9b28 diff --git a/trunk/include/linux/list_bl.h b/trunk/include/linux/list_bl.h index 9ee97e7f2be4..b2adbb4b2f73 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) || defined(CONFIG_DEBUG_SPINLOCK) +#if defined(CONFIG_SMP) #define LIST_BL_LOCKMASK 1UL #else #define LIST_BL_LOCKMASK 0UL @@ -62,7 +62,8 @@ static inline void hlist_bl_set_first(struct hlist_bl_head *h, struct hlist_bl_node *n) { LIST_BL_BUG_ON((unsigned long)n & LIST_BL_LOCKMASK); - LIST_BL_BUG_ON(!((unsigned long)h->first & LIST_BL_LOCKMASK)); + LIST_BL_BUG_ON(((unsigned long)h->first & LIST_BL_LOCKMASK) != + LIST_BL_LOCKMASK); h->first = (struct hlist_bl_node *)((unsigned long)n | LIST_BL_LOCKMASK); } diff --git a/trunk/include/linux/rculist_bl.h b/trunk/include/linux/rculist_bl.h index b872b493724d..cf1244fbf3b6 100644 --- a/trunk/include/linux/rculist_bl.h +++ b/trunk/include/linux/rculist_bl.h @@ -11,7 +11,8 @@ static inline void hlist_bl_set_first_rcu(struct hlist_bl_head *h, struct hlist_bl_node *n) { LIST_BL_BUG_ON((unsigned long)n & LIST_BL_LOCKMASK); - LIST_BL_BUG_ON(!((unsigned long)h->first & LIST_BL_LOCKMASK)); + LIST_BL_BUG_ON(((unsigned long)h->first & LIST_BL_LOCKMASK) != + LIST_BL_LOCKMASK); rcu_assign_pointer(h->first, (struct hlist_bl_node *)((unsigned long)n | LIST_BL_LOCKMASK)); }