]> git.baikalelectronics.ru Git - kernel.git/commit
syscall: Sort out syscall_restart name clash.
authorEric W. Biederman <ebiederm@aristanetworks.com>
Wed, 20 May 2009 22:52:40 +0000 (15:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 May 2009 22:52:40 +0000 (15:52 -0700)
commitad31c7c54720ed91f31a8002b92ca524f4a14755
tree0dd44134615d92b6187afe95e7ddca1cc2b9a5cb
parentf0ca9b1e39ed3d4f021121d5d85696104579e99a
syscall: Sort out syscall_restart name clash.

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

> Today's linux-next build of at least some av32 and arm configs failed like this:
>
> arch/avr32/kernel/signal.c:216: error: conflicting types for 'restart_syscall'
> include/linux/sched.h:2184: error: previous definition of 'restart_syscall' was here
>
> Caused by commit d8389058ac0c018382f6322c63cc35e580e48d00 ("syscall:
> Implement a convinience function restart_syscall") from the net tree.

Grrr. Some days it feels like all of the good names are already taken.

Let's just rename the two static users in arm and avr32 to get this
sorted out.

Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/arm/kernel/signal.c
arch/avr32/kernel/signal.c