diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 01:16:36 -0500 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /kernel/ptrace.c | |
| parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index f764b8806955..ca2df68faf76 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -629,7 +629,7 @@ int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) | |||
| 629 | return (copied == sizeof(data)) ? 0 : -EIO; | 629 | return (copied == sizeof(data)) ? 0 : -EIO; |
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | #if defined CONFIG_COMPAT && defined __ARCH_WANT_COMPAT_SYS_PTRACE | 632 | #if defined CONFIG_COMPAT |
| 633 | #include <linux/compat.h> | 633 | #include <linux/compat.h> |
| 634 | 634 | ||
| 635 | int compat_ptrace_request(struct task_struct *child, compat_long_t request, | 635 | int compat_ptrace_request(struct task_struct *child, compat_long_t request, |
| @@ -726,4 +726,4 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, | |||
| 726 | unlock_kernel(); | 726 | unlock_kernel(); |
| 727 | return ret; | 727 | return ret; |
| 728 | } | 728 | } |
| 729 | #endif /* CONFIG_COMPAT && __ARCH_WANT_COMPAT_SYS_PTRACE */ | 729 | #endif /* CONFIG_COMPAT */ |