[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100329160251.702d2c60.sfr@canb.auug.org.au>
Date: Mon, 29 Mar 2010 16:02:51 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
"Richard Röjfors"
<richard.rojfors@...agicore.com>,
Dan Williams <dan.j.williams@...el.com>
Subject: linux-next: build failure after merge of the slabh tree
Hi Tejun,
After merging the slabh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/dma/timb_dma.c: In function 'td_alloc_init_desc':
drivers/dma/timb_dma.c:381: error: implicit declaration of function 'kzalloc'
drivers/dma/timb_dma.c:381: warning: assignment makes pointer from integer without a cast
drivers/dma/timb_dma.c:389: warning: assignment makes pointer from integer without a cast
drivers/dma/timb_dma.c:410: error: implicit declaration of function 'kfree'
drivers/dma/timb_dma.c: In function 'td_probe':
drivers/dma/timb_dma.c:710: warning: assignment makes pointer from integer without a cast
Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't
implicitly include slab.h from percpu.h") from the slabh tree interacting
with commit de5d4453c5b224eefd02b6a141ed411a76d458af ("dma: Add
timb-dma") from the async_tx tree.
I applied the following merge fixup patch which should be applied to the
async_tx tree (see Documentation/SubmitChecklist Rule #1 :-)).
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 29 Mar 2010 15:54:40 +1100
Subject: [PATCH] async_tx: use of kzalloc/kfree requires the include of slab.h
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/dma/timb_dma.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index e20d5c1..44b346d 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -27,6 +27,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/slab.h>
#include <linux/timb_dma.h>
--
1.7.0.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