Hi Gregory,
On Mon, 29 Mar 2010 17:07:27 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
