public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Jason Wessel <jason.wessel@windriver•com>
Subject: linux-next: manual merge of the tip tree with the kgdb tree
Date: Wed, 28 Oct 2009 18:04:54 +1100	[thread overview]
Message-ID: <20091028180454.488609b7.sfr@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/kgdb.c between commit
1cde88814e04c3b2bbe60e20c0927a0b4e1748ab ("kgdb,i386: Fix corner case
access to sp with NMI watch dog exception") from the kgdb tree and commit
5ca6c0ca5dbf105d7b0ffdae2289519982189730 ("x86: use kernel_stack_pointer
() in kgdb.c") from the tip tree.

I fixed it up (see below) but would like people to check as I am not sure
of the fix.  I can carry this as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

diff --cc arch/x86/kernel/kgdb.c
index e9afae9,3310d84..0000000
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@@ -85,15 -85,9 +85,15 @@@ void pt_regs_to_gdb_regs(unsigned long 
  	gdb_regs[GDB_DS]	= regs->ds;
  	gdb_regs[GDB_ES]	= regs->es;
  	gdb_regs[GDB_CS]	= regs->cs;
 -	gdb_regs[GDB_SS]	= __KERNEL_DS;
  	gdb_regs[GDB_FS]	= 0xFFFF;
  	gdb_regs[GDB_GS]	= 0xFFFF;
 +	if (user_mode_vm(regs)) {
 +		gdb_regs[GDB_SS] = regs->ss;
 +		gdb_regs[GDB_SP] = regs->sp;
 +	} else {
 +		gdb_regs[GDB_SS] = __KERNEL_DS;
- 		gdb_regs[GDB_SP] = (unsigned long)&regs->sp;
++		gdb_regs[GDB_SP] = kernel_stack_pointer(regs);
 +	}
  #else
  	gdb_regs[GDB_R8]	= regs->r8;
  	gdb_regs[GDB_R9]	= regs->r9;
@@@ -106,8 -100,8 +106,8 @@@
  	gdb_regs32[GDB_PS]	= regs->flags;
  	gdb_regs32[GDB_CS]	= regs->cs;
  	gdb_regs32[GDB_SS]	= regs->ss;
- 	gdb_regs[GDB_SP]	= regs->sp;
 -#endif
+ 	gdb_regs[GDB_SP]	= kernel_stack_pointer(regs);
 +#endif
  }
  
  /**

next             reply	other threads:[~2009-10-28  7:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-28  7:04 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-01-14  5:13 linux-next: manual merge of the tip tree with the kgdb tree Stephen Rothwell
2010-01-14  9:26 ` Ingo Molnar
2010-01-14 15:01   ` Jason Wessel
2010-01-14 15:20     ` Steven Rostedt
2010-01-14 15:49       ` Jason Wessel
2010-02-01  6:29 Stephen Rothwell
2010-02-01 15:46 ` Jason Wessel
2010-02-01 23:25   ` Stephen Rothwell
2010-05-14  4:14 Stephen Rothwell
2010-05-14 14:00 ` Don Zickus

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=20091028180454.488609b7.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=hpa@zytor$(echo .)com \
    --cc=jason.wessel@windriver$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=peterz@infradead$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox