diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 02:07:30 -0400 |
| commit | a0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch) | |
| tree | 2cad553a9def773ce79b8fc793f89c0634187109 /arch/s390/include/asm/ptrace.h | |
| parent | 89ccf465abe6b20d804a63ae20307970c441369d (diff) | |
| parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/include/asm/ptrace.h')
| -rw-r--r-- | arch/s390/include/asm/ptrace.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index 539263fc9ab9..95dcf183a28d 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h | |||
| @@ -311,6 +311,10 @@ typedef struct | |||
| 311 | __u32 orig_gpr2; | 311 | __u32 orig_gpr2; |
| 312 | } s390_compat_regs; | 312 | } s390_compat_regs; |
| 313 | 313 | ||
| 314 | typedef struct | ||
| 315 | { | ||
| 316 | __u32 gprs_high[NUM_GPRS]; | ||
| 317 | } s390_compat_regs_high; | ||
| 314 | 318 | ||
| 315 | #ifdef __KERNEL__ | 319 | #ifdef __KERNEL__ |
| 316 | 320 | ||