* Re: linux-next: net tree build failure [not found] <20090521001928.4bf71911.sfr@canb.auug.org.au> @ 2009-05-20 14:53 ` Eric W. Biederman 2009-05-20 19:44 ` David Miller 0 siblings, 1 reply; 4+ messages in thread From: Eric W. Biederman @ 2009-05-20 14:53 UTC (permalink / raw) To: Stephen Rothwell Cc: David S. Miller, linux-next, linux-kernel, Russell King, Haavard Skinnemoen Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi Dave, > > 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 690cc3ffe33ac4a2857583c22d4c6244ae11684d ("syscall: > Implement a convinience function restart_syscall") from the net tree. > > grep is your friend ... Grrr. Some days it feels like all of the good names are already taken. How does this look for a solution to the name clash? --- diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 80b8b5c..88a8f0b 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -532,7 +532,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, return err; } -static inline void restart_syscall(struct pt_regs *regs) +static inline void setup_syscall_restart(struct pt_regs *regs) { regs->ARM_r0 = regs->ARM_ORIG_r0; regs->ARM_pc -= thumb_mode(regs) ? 2 : 4; @@ -567,7 +567,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, } /* fallthrough */ case -ERESTARTNOINTR: - restart_syscall(regs); + setup_syscall_restart(regs); } } diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index 803d7be..2722756 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c @@ -212,7 +212,7 @@ out: return err; } -static inline void restart_syscall(struct pt_regs *regs) +static inline void setup_syscall_restart(struct pt_regs *regs) { if (regs->r12 == -ERESTART_RESTARTBLOCK) regs->r8 = __NR_restart_syscall; @@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall) } /* fall through */ case -ERESTARTNOINTR: - restart_syscall(regs); + setup_syscall_restart(regs); } } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: net tree build failure 2009-05-20 14:53 ` linux-next: net tree build failure Eric W. Biederman @ 2009-05-20 19:44 ` David Miller 2009-05-20 22:48 ` Subject: [PATCH] Sort out syscall_restart name clash Eric W. Biederman 0 siblings, 1 reply; 4+ messages in thread From: David Miller @ 2009-05-20 19:44 UTC (permalink / raw) To: ebiederm; +Cc: sfr, linux-next, linux-kernel, rmk, hskinnemoen From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 20 May 2009 07:53:21 -0700 > Grrr. Some days it feels like all of the good names are already taken. > > How does this look for a solution to the name clash? Give me a signoff so I can apply this Eric, thanks. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Subject: [PATCH] Sort out syscall_restart name clash. 2009-05-20 19:44 ` David Miller @ 2009-05-20 22:48 ` Eric W. Biederman 2009-05-20 22:52 ` David Miller 0 siblings, 1 reply; 4+ messages in thread From: Eric W. Biederman @ 2009-05-20 22:48 UTC (permalink / raw) To: David Miller; +Cc: sfr, linux-next, linux-kernel, rmk, hskinnemoen 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 690cc3ffe33ac4a2857583c22d4c6244ae11684d ("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> --- arch/arm/kernel/signal.c | 6 +++--- arch/avr32/kernel/signal.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 80b8b5c..614c9f6 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -532,7 +532,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, return err; } -static inline void restart_syscall(struct pt_regs *regs) +static inline void setup_syscall_restart(struct pt_regs *regs) { regs->ARM_r0 = regs->ARM_ORIG_r0; regs->ARM_pc -= thumb_mode(regs) ? 2 : 4; @@ -567,7 +567,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, } /* fallthrough */ case -ERESTARTNOINTR: - restart_syscall(regs); + setup_syscall_restart(regs); } } @@ -691,7 +691,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) if (regs->ARM_r0 == -ERESTARTNOHAND || regs->ARM_r0 == -ERESTARTSYS || regs->ARM_r0 == -ERESTARTNOINTR) { - restart_syscall(regs); + setup_syscall_restart(regs); } } single_step_set(current); diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index 803d7be..2722756 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c @@ -212,7 +212,7 @@ out: return err; } -static inline void restart_syscall(struct pt_regs *regs) +static inline void setup_syscall_restart(struct pt_regs *regs) { if (regs->r12 == -ERESTART_RESTARTBLOCK) regs->r8 = __NR_restart_syscall; @@ -296,7 +296,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall) } /* fall through */ case -ERESTARTNOINTR: - restart_syscall(regs); + setup_syscall_restart(regs); } } -- 1.6.1.2.350.g88cc ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Subject: [PATCH] Sort out syscall_restart name clash. 2009-05-20 22:48 ` Subject: [PATCH] Sort out syscall_restart name clash Eric W. Biederman @ 2009-05-20 22:52 ` David Miller 0 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2009-05-20 22:52 UTC (permalink / raw) To: ebiederm; +Cc: sfr, linux-next, linux-kernel, rmk, hskinnemoen From: ebiederm@xmission.com (Eric W. Biederman) Date: Wed, 20 May 2009 15:48:20 -0700 > > 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 690cc3ffe33ac4a2857583c22d4c6244ae11684d ("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> Applied, thanks Eric. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-05-20 22:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20090521001928.4bf71911.sfr@canb.auug.org.au>
2009-05-20 14:53 ` linux-next: net tree build failure Eric W. Biederman
2009-05-20 19:44 ` David Miller
2009-05-20 22:48 ` Subject: [PATCH] Sort out syscall_restart name clash Eric W. Biederman
2009-05-20 22:52 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).