Merge commit 'v2.6.31-rc8' into sched/core

[linux-beck.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7bc2d9290837abda7c440bce40c3adcde7eaf790..e209ae0e7a8a6238701abdf0a972fe8fb5ade3c9 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1199,6 +1199,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