linux-next: build failure after merge of the slabh tree
Subsystems (3)
Stephen Rothwell
AppliedHi 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 <[email protected]>
Date: Mon, 29 Mar 2010 15:38:45 +1100
Subject: [PATCH] hwlat: using kzalloc/kfree requires the include of slab.h
--- drivers/misc/hwlat_detector.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/misc/hwlat_detector.c +1 -0
@@ -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 */
Signature · 7 lines
1.7.0.3 -- Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
PATCH 1/1 kmemcheck: build failure after merge of the slabh tree
Quoted 4 lines · 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 <[email protected]>
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)
--- mm/kmemcheck.c | 1 + 1 file changed, 1 insertion(+)
mm/kmemcheck.c +1 -0
@@ -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
Hello,
Quoted 1 line · Randy Dunlap
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.
Quoted 3 lines
Sorry if I missed this patch in the (email) storm.
mm/kmemcheck.calso needsslab.hadded 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. :-)
Signature · 1 line
tejun
Tejun Heo
AppliedRe: [PATCH -next] kmemcheck: build failure after merge of the slabh tree
Quoted 5 lines · Tejun Heo
Quoted 1 line
mm/kmemcheck.calso needsslab.hadded 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.
Signature · 1 line
tejun
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.
Hi Jon,
Quoted 3 lines · On Tue, 30 Mar 2010 08:14:15 -0400 Jon Masters <[email protected]> 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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/