diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /arch/s390/kernel/compat_ptrace.h | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/s390/kernel/compat_ptrace.h')
| -rw-r--r-- | arch/s390/kernel/compat_ptrace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_ptrace.h b/arch/s390/kernel/compat_ptrace.h index a2be3a978d5c..123dd660d7fb 100644 --- a/arch/s390/kernel/compat_ptrace.h +++ b/arch/s390/kernel/compat_ptrace.h | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | #ifndef _PTRACE32_H | 1 | #ifndef _PTRACE32_H |
| 2 | #define _PTRACE32_H | 2 | #define _PTRACE32_H |
| 3 | 3 | ||
| 4 | #include <asm/ptrace.h> /* needed for NUM_CR_WORDS */ | ||
| 4 | #include "compat_linux.h" /* needed for psw_compat_t */ | 5 | #include "compat_linux.h" /* needed for psw_compat_t */ |
| 5 | 6 | ||
| 6 | typedef struct { | 7 | typedef struct { |
| 7 | __u32 cr[3]; | 8 | __u32 cr[NUM_CR_WORDS]; |
| 8 | } per_cr_words32; | 9 | } per_cr_words32; |
| 9 | 10 | ||
| 10 | typedef struct { | 11 | typedef struct { |