From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [patch 5/6] Move psw_set_key.
Date: Tue, 19 Jun 2007 10:45:21 +0200 [thread overview]
Message-ID: <20070619084642.673859525@de.ibm.com> (raw)
In-Reply-To: 20070619084516.457715754@de.ibm.com
[-- Attachment #1: 005-set-key.diff --]
[-- Type: text/plain, Size: 1321 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Move psw_set_key() from ptrace.h to processor.h which is a more
suitable place for it. In addition the moves makes the function
invisible to user space.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/kernel/traps.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Index: quilt-2.6/arch/s390/kernel/traps.c
===================================================================
--- quilt-2.6.orig/arch/s390/kernel/traps.c
+++ quilt-2.6/arch/s390/kernel/traps.c
@@ -253,20 +253,22 @@ void die(const char * str, struct pt_reg
{
static int die_counter;
+ oops_enter();
debug_stop_all();
console_verbose();
spin_lock_irq(&die_lock);
bust_spinlocks(1);
printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
print_modules();
- show_regs(regs);
+ show_regs(regs);
bust_spinlocks(0);
- spin_unlock_irq(&die_lock);
+ spin_unlock_irq(&die_lock);
if (in_interrupt())
panic("Fatal exception in interrupt");
if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
- do_exit(SIGSEGV);
+ oops_exit();
+ do_exit(SIGSEGV);
}
static void inline
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
next prev parent reply other threads:[~2007-06-19 8:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-19 8:45 [patch 0/6] s390 patches for 2.6.22 Martin Schwidefsky
2007-06-19 8:45 ` [patch 1/6] Missing blank when appending cio_ignore kernel parameter Martin Schwidefsky
2007-06-19 8:45 ` [patch 2/6] Fix zfcpdump header Martin Schwidefsky
2007-06-19 8:45 ` [patch 3/6] Fix yet another two section mismatches Martin Schwidefsky
2007-06-19 8:45 ` [patch 4/6] Print list of modules on die() Martin Schwidefsky
2007-06-19 8:45 ` Martin Schwidefsky [this message]
2007-06-19 9:12 ` [patch 5/6] Move psw_set_key Bastian Blank
2007-06-19 9:34 ` Heiko Carstens
2007-06-19 11:11 ` Martin Schwidefsky
2007-06-19 9:17 ` Paul Mundt
2007-06-19 8:45 ` [patch 6/6] Add oops_enter()/oops_exit() calls to die() Martin Schwidefsky
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=20070619084642.673859525@de.ibm.com \
--to=schwidefsky@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@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: 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).