diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:28:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:28:34 -0400 |
| commit | 4d9dec4db2efbd7edb549bd02373995b67496983 (patch) | |
| tree | a0ddbecea4823a7f3e20ab6eacb37a086a72dc36 /include/linux | |
| parent | 34b064569eba3bec65bf98efe057b0578fe13297 (diff) | |
| parent | ae6b585eeb74670a2dec1fe4394bdfbdb9395cc2 (diff) | |
Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
* 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
exec: document acct_arg_size()
exec: unify do_execve/compat_do_execve code
exec: introduce struct user_arg_ptr
exec: introduce get_user_arg_ptr() helper
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/binfmts.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index c3d6512eded1..8845613fd7e3 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h | |||
| @@ -60,10 +60,6 @@ struct linux_binprm { | |||
| 60 | unsigned long loader, exec; | 60 | unsigned long loader, exec; |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | extern void acct_arg_size(struct linux_binprm *bprm, unsigned long pages); | ||
| 64 | extern struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, | ||
| 65 | int write); | ||
| 66 | |||
| 67 | #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0 | 63 | #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0 |
| 68 | #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT) | 64 | #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT) |
| 69 | 65 | ||