diff options
author | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-02-26 21:34:02 +0100 |
commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /arch/s390/kernel/entry.S | |
parent | fs/xfs: Correct NULL test (diff) | |
parent | Linux 2.6.33 (diff) | |
download | linux-398007f863a4af2b4a5a07219c5a617f1a098115.tar.xz linux-398007f863a4af2b4a5a07219c5a617f1a098115.zip |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'arch/s390/kernel/entry.S')
-rw-r--r-- | arch/s390/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 48215d15762b..e8ef21c51bbe 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -571,6 +571,7 @@ pgm_svcper: mvc __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID oi __TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP TRACE_IRQS_ON + lm %r2,%r6,SP_R2(%r15) # load svc arguments stosm __SF_EMPTY(%r15),0x03 # reenable interrupts b BASED(sysc_do_svc) |