From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Gregory Haskins <ghaskins@novell•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: Re: linux-next: build failure after merge of the slabh tree
Date: Thu, 20 May 2010 02:23:57 +1000 [thread overview]
Message-ID: <20100520022357.d57a6673.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100329170727.7a7b9a6d.sfr@canb.auug.org.au>
Hi Gregory,
On Mon, 29 Mar 2010 17:07:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the slabh tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/vbus/bus-proxy.c: In function 'vbus_driver_ioq_release':
> drivers/vbus/bus-proxy.c:192: error: implicit declaration of function 'kfree'
> drivers/vbus/bus-proxy.c: In function 'vbus_driver_ioq_alloc':
> drivers/vbus/bus-proxy.c:210: error: implicit declaration of function 'kzalloc'
> drivers/vbus/bus-proxy.c:210: warning: assignment makes pointer from integer without a cast
> drivers/vbus/bus-proxy.c:214: 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 5ff775e4c3d6b0ead7d8784797123a2deed73364 ("ioq: add
> driver-side vbus helpers") from the alacrity tree.
>
> I applied the following merge fixup patch which should be applied to the
> alacrity tree (see Documentation/SubmitChecklist Rule #1 :-)).
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 29 Mar 2010 17:03:25 +1100
> Subject: [PATCH] vbus: use of kzalloc/kfree requires the include of slab.h
This patch is needed on the alacrity tree since the slabh tree has been
merged int Linus' tree some time ago. Pleas apply (patch reposted below).
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 29 Mar 2010 17:03:25 +1100
Subject: [PATCH] vbus: use of kzalloc/kfree requires the include of slab.h
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/vbus/bus-proxy.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/vbus/bus-proxy.c b/drivers/vbus/bus-proxy.c
index 4792842..ae11f67 100644
--- a/drivers/vbus/bus-proxy.c
+++ b/drivers/vbus/bus-proxy.c
@@ -19,6 +19,7 @@
*/
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/vbus_driver.h>
MODULE_AUTHOR("Gregory Haskins");
--
1.7.0.3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2010-05-19 16:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-29 6:07 linux-next: build failure after merge of the slabh tree Stephen Rothwell
2010-05-19 16:23 ` Stephen Rothwell [this message]
-- 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 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 22:33 ` Dan Williams
2010-03-29 23:16 ` 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=20100520022357.d57a6673.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ghaskins@novell$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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