linux-next: ftrace build failure

linux-next: ftrace build failure

[Stephen Rothwell]

Hi Ingo,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/mm/kmmio.c: In function 'get_kmmio_probe':
arch/x86/mm/kmmio.c:85: error: implicit declaration of function 'list_for_each_entry_rcu'
arch/x86/mm/kmmio.c:85: error: 'list' undeclared (first use in this function)
arch/x86/mm/kmmio.c:85: error: (Each undeclared identifier is reported only once
arch/x86/mm/kmmio.c:85: error: for each function it appears in.)
arch/x86/mm/kmmio.c:85: error: syntax error before '{' token
arch/x86/mm/kmmio.c:88: warning: no return statement in function returning non-void
arch/x86/mm/kmmio.c: In function 'get_kmmio_fault_page':
arch/x86/mm/kmmio.c:100: error: 'list' undeclared (first use in this function)
arch/x86/mm/kmmio.c:100: error: syntax error before '{' token
arch/x86/mm/kmmio.c:103: warning: no return statement in function returning non-void
arch/x86/mm/kmmio.c: In function 'add_kmmio_fault_page':
arch/x86/mm/kmmio.c:328: error: implicit declaration of function 'list_add_rcu'
arch/x86/mm/kmmio.c: In function 'remove_kmmio_fault_pages':
arch/x86/mm/kmmio.c:420: error: implicit declaration of function 'list_del_rcu'

This is caused by the merge with the sched tree which contains the
ruclist split.

I applied the patch below.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From ee19aa543ada9ce11a0b3b8480f3a268ff86cb02 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 May 2008 12:53:04 +1000
Subject: [PATCH] ftrace: fix rculist split fallout

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

diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index b65871e..7bfdad7 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <asm/debugreg.h>
 #include <linux/mmiotrace.h>
+#include <linux/rculist.h>
 
 #define KMMIO_PAGE_HASH_BITS 4
 #define KMMIO_PAGE_TABLE_SIZE (1 << KMMIO_PAGE_HASH_BITS)
-- 
1.5.5.1

Re: linux-next: ftrace build failure

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
> @@ -23,6 +23,7 @@
>  #include <linux/errno.h>
>  #include <asm/debugreg.h>
>  #include <linux/mmiotrace.h>
> +#include <linux/rculist.h>

this is not an 'ftrace build bug', this is an integration artifact of 
-next. It is fixed in -tip too (which too integrates these topics) in a 
different branch.

it's in a different branch because this is a change only makes sense if 
the 'tip/core/rcu' and 'tip/auto-ftrace-next' topics are combined - 
hence it lives in the "tip/auto-test-fixes" (commit 48bd24be18) - and 
this change was always there as the combined result wouldnt even build 
without this fix.

So this is a true "merge only commit" that cannot live standalone in any 
of the topic branches it is related to.

	Ingo

Re: linux-next: ftrace build failure

[Stephen Rothwell]

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

Hi Ingo,

On Tue, 27 May 2008 09:43:10 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> this is not an 'ftrace build bug', this is an integration artifact of 

I didn't say it was a bug.  My subject line (and I have been writing them
like this since I started linux-next in February) means "The build failed
after I merged the ftrace tree".  Nothing more, nothing less.

> -next. It is fixed in -tip too (which too integrates these topics) in a 
> different branch.

And I said it was a merge artifact.

> it's in a different branch because this is a change only makes sense if 
> the 'tip/core/rcu' and 'tip/auto-ftrace-next' topics are combined - 
> hence it lives in the "tip/auto-test-fixes" (commit 48bd24be18) - and 
> this change was always there as the combined result wouldnt even build 
> without this fix.

Good and correct.

> So this is a true "merge only commit" that cannot live standalone in any 
> of the topic branches it is related to.

Right.  And I am happy to carry the patch if you want me to.
Alternatively, since auto-ftrace-next is really only meant for merging
into linux-next, you could merge core/rcu (in addition to the curent
merge into auto-sched-next) and the fixup into there.

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

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