From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"\"Richard Röjfors\"" <richard.rojfors@pelagicore•com>,
"Dan Williams" <dan.j.williams@intel•com>
Subject: linux-next: build failure after merge of the slabh tree
Date: Mon, 29 Mar 2010 16:02:51 +1100 [thread overview]
Message-ID: <20100329160251.702d2c60.sfr@canb.auug.org.au> (raw)
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@canb•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@canb•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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-03-29 6:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 5:02 Stephen Rothwell [this message]
2010-03-29 22:33 ` linux-next: build failure after merge of the slabh tree Dan Williams
2010-03-29 23:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-04-01 5:41 Stephen Rothwell
2010-04-01 7:29 ` David Miller
2010-04-01 7:31 ` Tejun Heo
2010-04-01 7:40 ` Stephen Rothwell
2010-03-29 6:55 Stephen Rothwell
2010-03-29 7:34 ` Takashi Iwai
2010-03-29 6:07 Stephen Rothwell
2010-05-19 16:23 ` Stephen Rothwell
2010-03-29 5:59 Stephen Rothwell
2010-03-29 5:53 Stephen Rothwell
2010-03-29 5:47 Stephen Rothwell
2010-03-29 5:39 Stephen Rothwell
2010-03-29 5:34 Stephen Rothwell
2010-03-29 5:29 Stephen Rothwell
2010-03-29 5:28 Stephen Rothwell
2010-03-29 5:28 Stephen Rothwell
2010-03-29 5:02 Stephen Rothwell
2010-03-29 6:28 ` Takashi Iwai
2010-03-29 6:38 ` Stephen Rothwell
2010-03-29 8:01 ` Stephen Rothwell
2010-03-29 8:05 ` Takashi Iwai
2010-03-29 11:10 ` Tejun Heo
2010-03-29 12:25 ` Stephen Rothwell
2010-03-29 5:02 Stephen Rothwell
2010-03-30 19:32 ` Jason Wessel
2010-03-30 22:49 ` Stephen Rothwell
2010-03-29 4:42 Stephen Rothwell
2010-03-30 12:14 ` Jon Masters
2010-03-30 13:45 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100329160251.702d2c60.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=richard.rojfors@pelagicore$(echo .)com \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox