| Message ID | 20240328100640.d3ffb37dc64b.I2e2e713d6a78ea24e6508db9d3ef2882b88861da@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] um: signal: move pid variable where needed | expand |
On 3/28/24 5:06 PM, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > We have W=1 warnings on 64-bit because the pid is only > used in branches on 32-bit; move it inside to get rid of > the warnings. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > arch/x86/um/signal.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c > index 263e1d08f216..16ff097e790d 100644 > --- a/arch/x86/um/signal.c > +++ b/arch/x86/um/signal.c > @@ -155,7 +155,7 @@ static int copy_sc_from_user(struct pt_regs *regs, > struct sigcontext __user *from) > { > struct sigcontext sc; > - int err, pid; > + int err; > > /* Always make any pending restarted system calls return -EINTR */ > current->restart_block.fn = do_no_restart_syscall; > @@ -201,10 +201,10 @@ static int copy_sc_from_user(struct pt_regs *regs, > > #undef GETREG > > - pid = userspace_pid[current_thread_info()->cpu]; > #ifdef CONFIG_X86_32 > if (have_fpx_regs) { > struct user_fxsr_struct fpx; > + int pid = userspace_pid[current_thread_info()->cpu]; Tiny nit: might be better to move it before "struct user_fxsr_struct fpx;". And it will be more consistent with the other change in this patch. :) > > err = copy_from_user(&fpx, > &((struct _fpstate __user *)sc.fpstate)->_fxsr_env[0], > @@ -240,7 +240,7 @@ static int copy_sc_to_user(struct sigcontext __user *to, > { > struct sigcontext sc; > struct faultinfo * fi = ¤t->thread.arch.faultinfo; > - int err, pid; > + int err; > memset(&sc, 0, sizeof(struct sigcontext)); > > #define PUTREG(regno, regname) sc.regname = regs->regs.gp[HOST_##regno] > @@ -288,10 +288,9 @@ static int copy_sc_to_user(struct sigcontext __user *to, > if (err) > return 1; > > - pid = userspace_pid[current_thread_info()->cpu]; > - > #ifdef CONFIG_X86_32 > if (have_fpx_regs) { > + int pid = userspace_pid[current_thread_info()->cpu]; > struct user_fxsr_struct fpx; > > err = save_fpx_registers(pid, (unsigned long *) &fpx); For the series, feel free to add my Reviewed-by: Tiwei Bie <tiwei.btw@antgroup.com> Regards, Tiwei
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index 263e1d08f216..16ff097e790d 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c @@ -155,7 +155,7 @@ static int copy_sc_from_user(struct pt_regs *regs, struct sigcontext __user *from) { struct sigcontext sc; - int err, pid; + int err; /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; @@ -201,10 +201,10 @@ static int copy_sc_from_user(struct pt_regs *regs, #undef GETREG - pid = userspace_pid[current_thread_info()->cpu]; #ifdef CONFIG_X86_32 if (have_fpx_regs) { struct user_fxsr_struct fpx; + int pid = userspace_pid[current_thread_info()->cpu]; err = copy_from_user(&fpx, &((struct _fpstate __user *)sc.fpstate)->_fxsr_env[0], @@ -240,7 +240,7 @@ static int copy_sc_to_user(struct sigcontext __user *to, { struct sigcontext sc; struct faultinfo * fi = ¤t->thread.arch.faultinfo; - int err, pid; + int err; memset(&sc, 0, sizeof(struct sigcontext)); #define PUTREG(regno, regname) sc.regname = regs->regs.gp[HOST_##regno] @@ -288,10 +288,9 @@ static int copy_sc_to_user(struct sigcontext __user *to, if (err) return 1; - pid = userspace_pid[current_thread_info()->cpu]; - #ifdef CONFIG_X86_32 if (have_fpx_regs) { + int pid = userspace_pid[current_thread_info()->cpu]; struct user_fxsr_struct fpx; err = save_fpx_registers(pid, (unsigned long *) &fpx);