mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
	"Catalin Marinas" <catalin.marinas@arm.com>
Subject: linux-next: manual merge of the signal tree with the cortex tree
Date: Mon, 5 Nov 2012 15:03:07 +1100	[thread overview]
Message-ID: <20121105150307.05dc233ef299ab73df5dbf89@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

Hi Al,

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;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-11-05  4:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-05  4:03 Stephen Rothwell [this message]
2012-11-05  8:37 ` Uwe Kleine-König

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=20121105150307.05dc233ef299ab73df5dbf89@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --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

all inboxes | Powered by JetHome®