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

From: Frederic Weisbecker <[email-masked]>
Date: Mon, 1 Mar 2010 02:08:52 +0100

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?

> 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                    [email-masked]
> 
> From: Stephen Rothwell <[email-masked]>
> 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 <[email-masked]>
> ---
>  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;

Looks like the right patch yeah.

Thanks.