From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Catalin Marinas <catalin.marinas@arm•com>
Subject: Re: linux-next: manual merge of the signal tree with the cortex tree
Date: Mon, 5 Nov 2012 09:37:26 +0100 [thread overview]
Message-ID: <20121105083726.GA22235@pengutronix.de> (raw)
In-Reply-To: <20121105150307.05dc233ef299ab73df5dbf89@canb.auug.org.au>
Hello Stephen,
On Mon, Nov 05, 2012 at 03:03:07PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the signal tree got a conflict in
> arch/arm/kernel/process.c between commit 77a3018e38b9 ("Cortex-M3: Add
> support for exception handling") from the cortex tree and commit
> 9e6479930021 ("arm: switch to generic fork/vfork/clone") from the signal
> tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc arch/arm/kernel/process.c
> index 585b9ab,4ab80bb..0000000
> --- a/arch/arm/kernel/process.c
> +++ b/arch/arm/kernel/process.c
> @@@ -384,14 -383,11 +384,15 @@@ copy_thread(unsigned long clone_flags,
>
> memset(&thread->cpu_context, 0, sizeof(struct cpu_context_save));
>
> - if (likely(regs)) {
> - *childregs = *regs;
> + if (likely(!(p->flags & PF_KTHREAD))) {
> + *childregs = *current_pt_regs();
> childregs->ARM_r0 = 0;
> - childregs->ARM_sp = stack_start;
> + if (stack_start)
> + childregs->ARM_sp = stack_start;
> +#if defined CONFIG_CPU_V7M
> + /* Return to Thread mode with Process stack */
> + childregs->ARM_EXC_RET = 0xfffffffdUL;
> +#endif
> } else {
> memset(childregs, 0, sizeof(struct pt_regs));
> thread->cpu_context.r4 = stk_sz;
looks good and works for me
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
prev parent reply other threads:[~2012-11-05 8:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 4:03 linux-next: manual merge of the signal tree with the cortex tree Stephen Rothwell
2012-11-05 8:37 ` Uwe Kleine-König [this message]
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=20121105083726.GA22235@pengutronix.de \
--to=u.kleine-koenig@pengutronix$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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