diff options
| author | Anton Blanchard <anton@samba.org> | 2003-01-14 15:39:43 +1100 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2003-01-14 15:39:43 +1100 |
| commit | 1362870b954f86e86e05288b5df0e2341e45354c (patch) | |
| tree | 927215aa7e0e0bba229e4f76f3497187a4de69a0 /include | |
| parent | f3ae5c72087bd059e0a188e57a171709c4fd72fa (diff) | |
| parent | bcd998aad6496759d239eaba760a6ca6d1a73e2c (diff) | |
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/for-alan
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/ptrace.h | 3 | ||||
| -rw-r--r-- | include/asm-s390x/compat.h | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/asm-i386/ptrace.h b/include/asm-i386/ptrace.h index e6d24421aa63..d80fd6557d05 100644 --- a/include/asm-i386/ptrace.h +++ b/include/asm-i386/ptrace.h @@ -51,6 +51,9 @@ struct pt_regs { #define PTRACE_OLDSETOPTIONS 21 +#define PTRACE_GET_THREAD_AREA 25 +#define PTRACE_SET_THREAD_AREA 26 + #ifdef __KERNEL__ #define user_mode(regs) ((VM_MASK & (regs)->eflags) || (3 & (regs)->xcs)) #define instruction_pointer(regs) ((regs)->eip) diff --git a/include/asm-s390x/compat.h b/include/asm-s390x/compat.h index d84bb8d4020d..1b2a43d03fe1 100644 --- a/include/asm-s390x/compat.h +++ b/include/asm-s390x/compat.h @@ -67,4 +67,17 @@ struct compat_flock { short __unused; }; +struct compat_statfs { + s32 f_type; + s32 f_bsize; + s32 f_blocks; + s32 f_bfree; + s32 f_bavail; + s32 f_files; + s32 f_ffree; + compat_fsid_t f_fsid; + s32 f_namelen; + s32 f_spare[6]; +}; + #endif /* _ASM_S390X_COMPAT_H */ |