diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:27:47 +0200 |
| commit | c4c0c56a7a85ed5725786219e4fbca7e840b1531 (patch) | |
| tree | c9d6b35a571fd5e80ddf5bf4a60142480eaa18d8 /include/linux/binfmts.h | |
| parent | 5127bed588a2f8f3a1f732de2a8a190b7df5dce3 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'include/linux/binfmts.h')
| -rw-r--r-- | include/linux/binfmts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index ee0ed48e8348..826f62350805 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -38,7 +38,7 @@ struct linux_binprm{ misc_bang:1; struct file * file; int e_uid, e_gid; - kernel_cap_t cap_inheritable, cap_permitted; + kernel_cap_t cap_post_exec_permitted; bool cap_effective; void *security; int argc, envc; |