diff options
| author | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /include/linux/sched.h | |
| parent | b08dc3eba0c34027010caeda258f495074ae3a54 (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 94990a882147..5c7ce13c1696 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1198,6 +1198,7 @@ struct task_struct { | |||
| 1198 | * a short time | 1198 | * a short time |
| 1199 | */ | 1199 | */ |
| 1200 | unsigned char fpu_counter; | 1200 | unsigned char fpu_counter; |
| 1201 | s8 oomkilladj; /* OOM kill score adjustment (bit shift). */ | ||
| 1201 | #ifdef CONFIG_BLK_DEV_IO_TRACE | 1202 | #ifdef CONFIG_BLK_DEV_IO_TRACE |
| 1202 | unsigned int btrace_seq; | 1203 | unsigned int btrace_seq; |
| 1203 | #endif | 1204 | #endif |