diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/linux/ptrace.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/linux/ptrace.h')
| -rw-r--r-- | include/linux/ptrace.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 0d36750fc0f1..ee918bc6e18c 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -51,6 +51,10 @@ | |||
| 51 | #ifdef __KERNEL__ | 51 | #ifdef __KERNEL__ |
| 52 | /* | 52 | /* |
| 53 | * Ptrace flags | 53 | * Ptrace flags |
| 54 | * | ||
| 55 | * The owner ship rules for task->ptrace which holds the ptrace | ||
| 56 | * flags is simple. When a task is running it owns it's task->ptrace | ||
| 57 | * flags. When the a task is stopped the ptracer owns task->ptrace. | ||
| 54 | */ | 58 | */ |
| 55 | 59 | ||
| 56 | #define PT_PTRACED 0x00000001 | 60 | #define PT_PTRACED 0x00000001 |