From: Catalin Marinas <catalin.marinas@arm.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-arch@vger.kernel.org, David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: Re: [RFC][CFT][CFReview] execve and kernel_thread unification work
Date: Wed, 17 Oct 2012 15:02:15 +0100 [thread overview]
Message-ID: <CAHkRjk7QbybMx1Kc9dP-Mz_ujMmHf5htLViviNok=HKjac0G+A@mail.gmail.com> (raw)
In-Reply-To: <20121015013009.GB2616@ZenIV.linux.org.uk>
Hi Al,
On 15 October 2012 02:30, Al Viro <viro@zeniv.linux.org.uk> wrote:
> arch-arm64 - patches from maintainer with minor followup folded
Thanks for updating the arm64 branch. I've adapted the changes, tested
and folded them into the branch below (the AArch64 instruction set
does not have conditional instructions):
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git
execve
Top commit: 6a872777ffff6184f4ac10bd71d926d5e6f2491e (arm64: Use
generic sys_execve() implementation)
The diff between your branch and mine (including one cosmetic change
as the ARM64 Kconfig selects are alphabetically sorted):
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 31e3b5e..75b212d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -6,8 +6,8 @@ config ARM64
select GENERIC_IOMAP
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
- select GENERIC_KERNEL_THREAD
select GENERIC_KERNEL_EXECVE
+ select GENERIC_KERNEL_THREAD
select GENERIC_SMP_IDLE_THREAD
select GENERIC_TIME_VSYSCALL
select HARDIRQS_SW_RESEND
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index c3d650a..6165318 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -611,10 +611,10 @@ ENDPROC(ret_to_user)
*/
ENTRY(ret_from_fork)
bl schedule_tail
- cmp x19, #0
- movne x0, x20
- blne x19
- get_thread_info tsk
+ cbz x19, 1f // not a kernel thread
+ mov x0, x20
+ blr x19
+1: get_thread_info tsk
b ret_to_user
ENDPROC(ret_from_fork)
--
Catalin
next prev parent reply other threads:[~2012-10-17 14:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-01 21:38 [RFC][CFT][CFReview] execve and kernel_thread unification work Al Viro
2012-10-05 16:07 ` Catalin Marinas
2012-10-06 16:19 ` Al Viro
2012-10-09 19:48 ` Chris Metcalf
2012-10-10 4:51 ` Al Viro
2012-10-11 9:00 ` Paul Mackerras
2012-10-11 12:53 ` Al Viro
2012-10-12 0:16 ` Paul Mackerras
2012-10-12 1:09 ` [git pull] signal.git, pile 2 (was Re: [RFC][CFT][CFReview] execve and kernel_thread unification work) Al Viro
2012-10-12 5:32 ` Paul Mackerras
2012-10-12 7:55 ` Benjamin Herrenschmidt
2012-10-15 1:30 ` [RFC][CFT][CFReview] execve and kernel_thread unification work Al Viro
2012-10-17 6:16 ` Greg Ungerer
2012-10-17 14:02 ` Catalin Marinas [this message]
2012-10-17 16:34 ` Al Viro
2012-10-17 16:40 ` Catalin Marinas
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='CAHkRjk7QbybMx1Kc9dP-Mz_ujMmHf5htLViviNok=HKjac0G+A@mail.gmail.com' \
--to=catalin.marinas@arm.com \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).