diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 09:28:52 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 09:29:05 +0200 |
commit | 29e2035bddecce3eb584a8304528b50da8370a24 (patch) | |
tree | 13155df7d90a8e287b83a1cd6c0d02c3018212ab /include/linux/sched.h | |
parent | rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments (diff) | |
parent | autofs4 - fix missed case when changing to use struct path (diff) | |
download | linux-dev-29e2035bddecce3eb584a8304528b50da8370a24.tar.xz linux-dev-29e2035bddecce3eb584a8304528b50da8370a24.zip |
Merge branch 'linus' into core/rcu
Merge reason: Avoid fuzz in init/main.c and update from rc6 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 855fd0d3f174..bd2675efd68d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1200,6 +1200,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 |