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

Stephen Rothwell

unread,

Feb 28, 2010, 8:10:01 PM2/28/10

to

Hi Mike,

After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here

Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
arch_syscall_addr() implementations") from the blackfin tree interacting
with commit e7b8e675d9c71b868b66f62f725a948047514719 ("tracing: Unify
arch_syscall_addr() implementations") from Linus' tree.

These are slightly different versions of the same patch. but merging with the blackfin tree managed to add a second copy of the above function. I have applied the following patch for today.
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Mon, 1 Mar 2010 11:56:09 +1100
Subject: [PATCH] blackfin: fix mismerge of kernel/trace/trace_syscalls.c

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
kernel/trace/trace_syscalls.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 37ca709..cba47d7 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -399,11 +399,6 @@ unsigned long __init arch_syscall_addr(int nr)
return (unsigned long)sys_call_table[nr];
}

-unsigned long __init arch_syscall_addr(int nr)
-{
- return (unsigned long)sys_call_table[nr];
-}
-
int __init init_ftrace_syscalls(void)
{
struct syscall_metadata *meta;
--
1.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Frederic Weisbecker

unread,

Feb 28, 2010, 8:10:01 PM2/28/10

to

On Mon, Mar 01, 2010 at 12:03:21PM +1100, Stephen Rothwell wrote:
> Hi Mike,
>
> After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
> kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here
>
> Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
> arch_syscall_addr() implementations") from the blackfin tree interacting

Oh, why is this patch in the blackfin tree?

Looks like the right patch yeah.

Thanks.

Stephen Rothwell

unread,

Feb 28, 2010, 11:10:01 PM2/28/10

to

Hi Frederic,

On Mon, 1 Mar 2010 02:08:52 +0100 Frederic Weisbecker <fwei...@gmail.com> wrote:
>
> Oh, why is this patch in the blackfin tree?

I have no idea beyond the fact that Mike is the Blackfin maintainer.

> Looks like the right patch yeah.

Thanks.

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

Mike Frysinger

unread,

Mar 2, 2010, 4:20:02 AM3/2/10

to

On Sun, Feb 28, 2010 at 20:03, Stephen Rothwell wrote:
> After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
> kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here
>
> Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
> arch_syscall_addr() implementations") from the blackfin tree interacting
> with commit e7b8e675d9c71b868b66f62f725a948047514719 ("tracing: Unify
> arch_syscall_addr() implementations") from Linus' tree.
>
> These are slightly different versions of the same patch. but merging with the blackfin tree managed to add a second copy of the above function. I have applied the following patch for today.

i'm traveling atm and wont be able to clean up my tree for a few more
days. i'd suggest you just drop the Blackfin tree as well as your
local patch. i'll drop a line once things are sane again on my side.
-mike

Mike Frysinger

unread,

Mar 9, 2010, 9:30:02 AM3/9/10

to

On Tue, Mar 2, 2010 at 04:15, Mike Frysinger wrote:
> On Sun, Feb 28, 2010 at 20:03, Stephen Rothwell wrote:
>> After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
>> kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here
>>
>> Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
>> arch_syscall_addr() implementations") from the blackfin tree interacting
>> with commit e7b8e675d9c71b868b66f62f725a948047514719 ("tracing: Unify
>> arch_syscall_addr() implementations") from Linus' tree.
>>
>> These are slightly different versions of the same patch. but merging with the blackfin tree managed to add a second copy of the above function. I have applied the following patch for today.
>
> i'm traveling atm and wont be able to clean up my tree for a few more
> days. i'd suggest you just drop the Blackfin tree as well as your
> local patch. i'll drop a line once things are sane again on my side.

my tree is sane again, so if you could pick it up again, that'd be
great. thanks!

Stephen Rothwell

unread,

Mar 9, 2010, 5:10:02 PM3/9/10

to

Hi Mike,

On Tue, 9 Mar 2010 09:26:29 -0500 Mike Frysinger <vapie...@gmail.com> wrote:
>
> my tree is sane again, so if you could pick it up again, that'd be
> great. thanks!

OK, will do from today.

--
Cheers,
Stephen Rothwell s...@canb.auug.org.au

http://www.canb.auug.org.au/~sfr/