linux-next: build failure after merge of the slabh tree

linux-next: build failure after merge of the slabh tree

[Stephen Rothwell]

Hi Tejun,

After merging the slabh tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/misc/hwlat_detector.c: In function 'debug_sample_fread':
drivers/misc/hwlat_detector.c:713: error: implicit declaration of function 'kzalloc'
drivers/misc/hwlat_detector.c:713: warning: assignment makes pointer from integer without a cast
drivers/misc/hwlat_detector.c:755: error: implicit declaration of function 'kfree'

Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't
implicitly include slab.h from percpu.h") from the slabh tree interacting
with commit 94366eaeaf5ac4831637de39eac48ca62afe4e2a ("hwlat_detector: A
system hardware latency detector") from the hwlat tree.

I applied the following merge fixup which should be applied to the hwlat
tree anyway, please Jon (see Documentation/SubmitChecklist Rule #1 :-))?

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Mar 2010 15:38:45 +1100
Subject: [PATCH] hwlat: using kzalloc/kfree requires the include of slab.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/misc/hwlat_detector.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c
index e02d8e1..a56baf4 100644
--- a/drivers/misc/hwlat_detector.c
+++ b/drivers/misc/hwlat_detector.c
@@ -50,6 +50,7 @@
 #include <linux/uaccess.h>
 #include <linux/version.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #define BUF_SIZE_DEFAULT	262144UL		/* 8K*(sizeof(entry)) */
 #define BUF_FLAGS		(RB_FL_OVERWRITE)	/* no block on full */
-- 
1.7.0.3


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[PATCH -next] kmemcheck: build failure after merge of the slabh tree

[Randy Dunlap]

On Mon, 29 Mar 2010 15:42:08 +1100 Stephen Rothwell wrote:

> Hi Tejun,
> 
> After merging the slabh tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:

This tree seems to be a bit messy.  :(

Sorry if I missed this patch in the (email) storm.

mm/kmemcheck.c also needs slab.h added to it:

---
From: Randy Dunlap <randy.dunlap@oracle.com>

Fix build errors due to missing slab.h:

mm/kmemcheck.c:69: error: dereferencing pointer to incomplete type
mm/kmemcheck.c:69: error: 'SLAB_NOTRACK' undeclared (first use in this function)
mm/kmemcheck.c:82: error: dereferencing pointer to incomplete type
mm/kmemcheck.c:94: error: dereferencing pointer to incomplete type
mm/kmemcheck.c:94: error: dereferencing pointer to incomplete type
mm/kmemcheck.c:94: error: 'SLAB_DESTROY_BY_RCU' undeclared (first use in this function)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 mm/kmemcheck.c |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20100329.orig/mm/kmemcheck.c
+++ linux-next-20100329/mm/kmemcheck.c
@@ -1,6 +1,7 @@
 #include <linux/gfp.h>
 #include <linux/mm_types.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/kmemcheck.h>
 
 void kmemcheck_alloc_shadow(struct page *page, int order, gfp_t flags, int node)

Re: [PATCH -next] kmemcheck: build failure after merge of the slabh tree

[Tejun Heo]

Hello,

On 03/30/2010 01:25 AM, Randy Dunlap wrote:
> This tree seems to be a bit messy.  :(

Sorry.  Most of the failures came from me forgetting to run the
conversion script on codes which are in linux-next but not mainline,
so all the new codes ended up broken by default.  I just sent out
patches against trees in linux-next.  Once they're in, there shouldn't
be many problems.

> Sorry if I missed this patch in the (email) storm.
> 
> mm/kmemcheck.c also needs slab.h added to it:

But this one is something I missed from the mainline (my script didn't
check for isolated SLAB_* flag usages).  I'll take this one into the
slabh tree.  Thanks for reporting this.  :-)

-- 
tejun

Re: [PATCH -next] kmemcheck: build failure after merge of the slabh tree

[Tejun Heo]

On 03/30/2010 03:00 AM, Tejun Heo wrote:
>> mm/kmemcheck.c also needs slab.h added to it:
> 
> But this one is something I missed from the mainline (my script didn't
> check for isolated SLAB_* flag usages).  I'll take this one into the
> slabh tree.  Thanks for reporting this.  :-)

Applied to slabh branch.  Thanks.

-- 
tejun

Re: linux-next: build failure after merge of the slabh tree

[Jon Masters]

Hi Stephen,

Can you remove the hwlat tree for the moment? I'm reworking it to use a
newer mechanism and will then repost a more generic version.

Jon.

Re: linux-next: build failure after merge of the slabh tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

Hi Jon,

On Tue, 30 Mar 2010 08:14:15 -0400 Jon Masters <jonathan@jonmasters.org> wrote:
>
> Can you remove the hwlat tree for the moment? I'm reworking it to use a
> newer mechanism and will then repost a more generic version.

OK, will do.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]