The patch titled
Subject: llist: define macro to check NMI safe cmpxchg
has been removed from the -mm tree. Its filename was
llist-define-macro-to-check-nmi-safe-cmpxchg.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Huang Ying <ying.huang@xxxxxxxxx>
Subject: llist: define macro to check NMI safe cmpxchg
To make code cleaner and reduce code duplication. Thanks Peter
Zijlstra for reminding.
Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/llist.h | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff -puN include/linux/llist.h~llist-define-macro-to-check-nmi-safe-cmpxchg include/linux/llist.h
--- a/include/linux/llist.h~llist-define-macro-to-check-nmi-safe-cmpxchg
+++ a/include/linux/llist.h
@@ -72,6 +72,12 @@ struct llist_node {
#define LLIST_HEAD_INIT(name) { NULL }
#define LLIST_HEAD(name) struct llist_head name = LLIST_HEAD_INIT(name)
+#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
+#define CHECK_NMI_SAFE_CMPXCHG()
+#else
+#define CHECK_NMI_SAFE_CMPXCHG() BUG_ON(in_nmi())
+#endif
+
/**
* init_llist_head - initialize lock-less list head
* @head: the head for your lock-less list
@@ -149,9 +155,7 @@ static inline void llist_add(struct llis
{
struct llist_node *entry, *old_entry;
-#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
- BUG_ON(in_nmi());
-#endif
+ CHECK_NMI_SAFE_CMPXCHG();
entry = head->first;
do {
@@ -173,9 +177,7 @@ static inline void llist_add_batch(struc
{
struct llist_node *entry, *old_entry;
-#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
- BUG_ON(in_nmi());
-#endif
+ CHECK_NMI_SAFE_CMPXCHG();
entry = head->first;
do {
@@ -203,9 +205,7 @@ static inline struct llist_node *llist_d
{
struct llist_node *entry, *old_entry, *next;
-#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
- BUG_ON(in_nmi());
-#endif
+ CHECK_NMI_SAFE_CMPXCHG();
entry = head->first;
do {
@@ -229,9 +229,7 @@ static inline struct llist_node *llist_d
*/
static inline struct llist_node *llist_del_all(struct llist_head *head)
{
-#ifndef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
- BUG_ON(in_nmi());
-#endif
+ CHECK_NMI_SAFE_CMPXCHG();
return xchg(&head->first, NULL);
}
_
Patches currently in -mm which might be from ying.huang@xxxxxxxxx are
linux-next.patch
lib-bitmapc-quiet-sparse-noise-about-address-space.patch
lib-bitmapc-quiet-sparse-noise-about-address-space-fix.patch
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
