From: Alex Dowad <alexinbeijing@gmail.com> To: linux-kernel@vger.kernel.org Cc: "open list:SUPERH" <linux-sh@vger.kernel.org> Subject: [PATCH 26/32] sh: copy_thread(): rename 'arg' argument to 'kthread_arg' Date: Fri, 13 Mar 2015 18:14:49 +0000 [thread overview] Message-ID: <1426270496-26362-16-git-send-email-alexinbeijing@gmail.com> (raw) In-Reply-To: <1426270496-26362-1-git-send-email-alexinbeijing@gmail.com> The 'arg' argument to copy_thread() is only ever used when forking a new kernel thread. Hence, rename it to 'kthread_arg' for clarity (and consistency with do_fork() and other arch-specific implementations of copy_thread()). Signed-off-by: Alex Dowad <alexinbeijing@gmail.com> --- arch/sh/kernel/process_32.c | 10 ++++++++-- arch/sh/kernel/process_64.c | 12 +++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 2885fc9..fded1b4 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -123,8 +123,11 @@ EXPORT_SYMBOL(dump_fpu); asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); +/* + * Copy architecture-specific thread state + */ int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) + unsigned long kthread_arg, struct task_struct *p) { struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs; @@ -146,9 +149,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, childregs = task_pt_regs(p); p->thread.sp = (unsigned long) childregs; if (unlikely(p->flags & PF_KTHREAD)) { + /* kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); p->thread.pc = (unsigned long) ret_from_kernel_thread; - childregs->regs[4] = arg; + childregs->regs[4] = kthread_arg; childregs->regs[5] = usp; childregs->sr = SR_MD; #if defined(CONFIG_SH_FPU) @@ -159,6 +163,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, p->thread.fpu_counter = 0; return 0; } + + /* user thread */ *childregs = *current_pt_regs(); if (usp) diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index e2062e6..693105d 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c @@ -371,8 +371,11 @@ EXPORT_SYMBOL(dump_fpu); asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); +/* + * Copy architecture-specific thread state + */ int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) + unsigned long kthread_arg, struct task_struct *p) { struct pt_regs *childregs; @@ -391,14 +394,17 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, p->thread.sp = (unsigned long) childregs; if (unlikely(p->flags & PF_KTHREAD)) { + /* kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); - childregs->regs[2] = (unsigned long)arg; - childregs->regs[3] = (unsigned long)usp; + childregs->regs[2] = kthread_arg; + childregs->regs[3] = usp; childregs->sr = (1 << 30); /* not user_mode */ childregs->sr |= SR_FD; /* Invalidate FPU flag */ p->thread.pc = (unsigned long) ret_from_kernel_thread; return 0; } + + /* user thread */ *childregs = *current_pt_regs(); /* -- 2.0.0.GIT
WARNING: multiple messages have this Message-ID (diff)
From: Alex Dowad <alexinbeijing@gmail.com> To: linux-kernel@vger.kernel.org Cc: linux-sh@vger.kernel.org (open list:SUPERH) Subject: [PATCH 26/32] sh: copy_thread(): rename 'arg' argument to 'kthread_arg' Date: Fri, 13 Mar 2015 20:14:49 +0200 [thread overview] Message-ID: <1426270496-26362-16-git-send-email-alexinbeijing@gmail.com> (raw) In-Reply-To: <1426270496-26362-1-git-send-email-alexinbeijing@gmail.com> The 'arg' argument to copy_thread() is only ever used when forking a new kernel thread. Hence, rename it to 'kthread_arg' for clarity (and consistency with do_fork() and other arch-specific implementations of copy_thread()). Signed-off-by: Alex Dowad <alexinbeijing@gmail.com> --- arch/sh/kernel/process_32.c | 10 ++++++++-- arch/sh/kernel/process_64.c | 12 +++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 2885fc9..fded1b4 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -123,8 +123,11 @@ EXPORT_SYMBOL(dump_fpu); asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); +/* + * Copy architecture-specific thread state + */ int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) + unsigned long kthread_arg, struct task_struct *p) { struct thread_info *ti = task_thread_info(p); struct pt_regs *childregs; @@ -146,9 +149,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, childregs = task_pt_regs(p); p->thread.sp = (unsigned long) childregs; if (unlikely(p->flags & PF_KTHREAD)) { + /* kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); p->thread.pc = (unsigned long) ret_from_kernel_thread; - childregs->regs[4] = arg; + childregs->regs[4] = kthread_arg; childregs->regs[5] = usp; childregs->sr = SR_MD; #if defined(CONFIG_SH_FPU) @@ -159,6 +163,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, p->thread.fpu_counter = 0; return 0; } + + /* user thread */ *childregs = *current_pt_regs(); if (usp) diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index e2062e6..693105d 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c @@ -371,8 +371,11 @@ EXPORT_SYMBOL(dump_fpu); asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); +/* + * Copy architecture-specific thread state + */ int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long arg, struct task_struct *p) + unsigned long kthread_arg, struct task_struct *p) { struct pt_regs *childregs; @@ -391,14 +394,17 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, p->thread.sp = (unsigned long) childregs; if (unlikely(p->flags & PF_KTHREAD)) { + /* kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); - childregs->regs[2] = (unsigned long)arg; - childregs->regs[3] = (unsigned long)usp; + childregs->regs[2] = kthread_arg; + childregs->regs[3] = usp; childregs->sr = (1 << 30); /* not user_mode */ childregs->sr |= SR_FD; /* Invalidate FPU flag */ p->thread.pc = (unsigned long) ret_from_kernel_thread; return 0; } + + /* user thread */ *childregs = *current_pt_regs(); /* -- 2.0.0.GIT
next prev parent reply other threads:[~2015-03-13 18:14 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-13 18:14 [PATCH 11/32] frv: copy_thread(): rename 'arg' argument to 'kthread_arg' Alex Dowad 2015-03-13 18:14 ` [PATCH 12/32] hexagon: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-16 16:25 ` rkuo 2015-03-13 18:14 ` [PATCH 13/32] ia64: copy_thread(): rename 'user_stack_size' " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-14 17:54 ` Alex Dowad 2015-03-14 17:54 ` Alex Dowad 2015-03-13 18:14 ` [PATCH 14/32] m32r: copy_thread(): rename 'arg' " Alex Dowad 2015-03-13 18:14 ` [PATCH 15/32] m68k: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-13 18:14 ` [PATCH 16/32] metag: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-16 11:39 ` James Hogan 2015-03-16 11:39 ` James Hogan 2015-03-16 13:13 ` [PATCHv2 " Alex Dowad 2015-03-16 14:31 ` James Hogan 2015-03-16 14:31 ` James Hogan 2015-03-16 14:38 ` Alex Dowad 2015-03-16 14:38 ` [PATCHv3 " Alex Dowad 2015-03-16 14:52 ` James Hogan 2015-03-16 14:52 ` James Hogan 2015-03-13 18:14 ` [PATCH 17/32] microblaze: " Alex Dowad 2015-03-13 18:14 ` [PATCH 18/32] mips: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-13 18:14 ` [PATCH 19/32] mn10300: copy_thread(): rename 'ustk_size' " Alex Dowad 2015-03-13 18:14 ` [PATCH 20/32] nios2: copy_thread(): rename 'arg' " Alex Dowad 2015-03-13 18:14 ` [PATCH 21/32] openrisc: " Alex Dowad 2015-03-13 18:14 ` [PATCH 22/32] parisc: " Alex Dowad 2015-03-13 18:14 ` [PATCH 23/32] powerpc: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-19 6:45 ` [23/32] " Michael Ellerman 2015-03-19 6:45 ` Michael Ellerman 2015-03-19 7:22 ` Alex Dowad 2015-03-19 7:22 ` Alex Dowad 2015-03-19 23:54 ` Michael Ellerman 2015-03-19 23:54 ` Michael Ellerman 2015-03-24 19:49 ` Alex Dowad 2015-03-24 19:49 ` Alex Dowad 2015-03-25 1:35 ` Michael Ellerman 2015-03-25 1:35 ` Michael Ellerman 2015-03-13 18:14 ` [PATCH 24/32] s390: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-13 18:14 ` [PATCH 25/32] score: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad [this message] 2015-03-13 18:14 ` [PATCH 26/32] sh: " Alex Dowad 2015-03-13 18:14 ` [PATCH 27/32] sparc: " Alex Dowad 2015-03-13 18:14 ` Alex Dowad 2015-03-13 18:14 ` [PATCH 28/32] tile: " Alex Dowad 2015-03-16 20:19 ` Chris Metcalf 2015-03-16 20:44 ` Alex Dowad 2015-03-19 18:06 ` Chris Metcalf 2015-03-13 18:14 ` [PATCH 29/32] um: " Alex Dowad 2015-03-13 18:14 ` [PATCH 30/32] unicore32: copy_thread(): rename 'stk_sz' " Alex Dowad 2015-03-13 18:14 ` [PATCH 31/32] x86: copy_thread(): rename 'arg' " Alex Dowad 2015-03-13 18:14 ` [PATCH 32/32] xtensa: " Alex Dowad
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1426270496-26362-16-git-send-email-alexinbeijing@gmail.com \ --to=alexinbeijing@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.