diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:07:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 11:07:16 -0800 |
| commit | f1ba3bc7b97ad0cc5886e5dadf4defba68f37819 (patch) | |
| tree | 733ec0fb6ab2f15732eb96b1fdd0e027ee3d4b92 /arch/s390/include/asm/ptrace.h | |
| parent | 95c5e1f1e6e1788cc8b9acbe9379ae395ef64958 (diff) | |
| parent | abd942194dcba2fa9d24d547b8acd4ef052eaf73 (diff) | |
| download | kernel_samsung_aries-f1ba3bc7b97ad0cc5886e5dadf4defba68f37819.zip kernel_samsung_aries-f1ba3bc7b97ad0cc5886e5dadf4defba68f37819.tar.gz kernel_samsung_aries-f1ba3bc7b97ad0cc5886e5dadf4defba68f37819.tar.bz2 | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] Fix alignment of initial kernel stack.
[S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
[S390] fix/cleanup sched_clock
[S390] fix system call parameter functions.
Diffstat (limited to 'arch/s390/include/asm/ptrace.h')
| -rw-r--r-- | arch/s390/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index 560ce85..5396f9f 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h @@ -321,8 +321,8 @@ struct pt_regs psw_t psw; unsigned long gprs[NUM_GPRS]; unsigned long orig_gpr2; + unsigned short svcnr; unsigned short ilc; - unsigned short trap; }; #endif |