diff options
| author |   James Morris <jmorris@namei.org> | 2009-08-20 09:18:42 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-20 09:18:42 +1000 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /include/linux/sched.h | |
| parent | Security/SELinux: remove duplicated #include (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff) | |
| download | linux-dev-ece13879e74313e62109e0755dd3d4f172df89e2.tar.xz linux-dev-ece13879e74313e62109e0755dd3d4f172df89e2.zip | |
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 { * a short time */ unsigned char fpu_counter; + s8 oomkilladj; /* OOM kill score adjustment (bit shift). */ #ifdef CONFIG_BLK_DEV_IO_TRACE unsigned int btrace_seq; #endif |