Merge branch 'akpm'

[safe/jmp/linux-2.6] / include / linux / mm_types.h

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 0042090..7acc843 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -240,6 +240,8 @@ struct mm_struct {
 
        unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
 
+       s8 oom_adj;     /* OOM kill score adjustment (bit shift) */
+
        cpumask_t cpu_vm_mask;
 
        /* Architecture-specific MM context */