diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/binfmts.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/binfmts.h')
| -rw-r--r-- | include/linux/binfmts.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 77b4a9e46004..6638b8148de7 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h | |||
| @@ -35,8 +35,7 @@ struct linux_binprm{ | |||
| 35 | #endif | 35 | #endif |
| 36 | struct mm_struct *mm; | 36 | struct mm_struct *mm; |
| 37 | unsigned long p; /* current top of mem */ | 37 | unsigned long p; /* current top of mem */ |
| 38 | unsigned int sh_bang:1, | 38 | unsigned int |
| 39 | misc_bang:1, | ||
| 40 | cred_prepared:1,/* true if creds already prepared (multiple | 39 | cred_prepared:1,/* true if creds already prepared (multiple |
| 41 | * preps happen for interpreters) */ | 40 | * preps happen for interpreters) */ |
| 42 | cap_effective:1;/* true if has elevated effective capabilities, | 41 | cap_effective:1;/* true if has elevated effective capabilities, |