diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/s390/include/asm/ptrace.h | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/s390/include/asm/ptrace.h')
| -rw-r--r-- | arch/s390/include/asm/ptrace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index a65846340d5..56da355678f 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h | |||
| @@ -324,7 +324,8 @@ struct pt_regs | |||
| 324 | psw_t psw; | 324 | psw_t psw; |
| 325 | unsigned long gprs[NUM_GPRS]; | 325 | unsigned long gprs[NUM_GPRS]; |
| 326 | unsigned long orig_gpr2; | 326 | unsigned long orig_gpr2; |
| 327 | unsigned int svc_code; | 327 | unsigned int int_code; |
| 328 | unsigned long int_parm_long; | ||
| 328 | }; | 329 | }; |
| 329 | 330 | ||
| 330 | /* | 331 | /* |