[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110928195601.9d0da0ea27186c4ce9349d94@canb.auug.org.au>
Date: Wed, 28 Sep 2011 19:56:01 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Miller <davem@...emloft.net>,
Huang Ying <ying.huang@...el.com>
Subject: linux-next: build failure after merge of the final tree
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from arch/sparc/mm/fault_32.c:21:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from arch/sparc/kernel/unaligned_32.c:18:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
In file included from include/linux/irq_work.h:4:0,
from include/linux/perf_event.h:510,
from kernel/sys.c:16:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:158:2: error: implicit declaration of function 'in_nmi'
Caused by commit 510d7dc70eab ("llist: make all llist functions inline")
from the akpm tree.
I applied this patch for today:
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 28 Sep 2011 19:51:38 +1000
Subject: [PATCH] llist: using in_nmi requires including hardirq.h
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
include/linux/llist.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/llist.h b/include/linux/llist.h
index 5d23564..fb81b7b 100644
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -73,6 +73,7 @@ struct llist_node {
#ifdef CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG
#define CHECK_NMI_SAFE_CMPXCHG()
#else
+#include <linux/hardirq.h>
#define CHECK_NMI_SAFE_CMPXCHG() BUG_ON(in_nmi())
#endif
--
1.7.6.3
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists