Merge branch 'csb1725' into csb1725-bdt

[mv-sheeva.git] / include / linux / mm_types.h

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index ee7e258627f9f5b9999e4c3033f7fa78c5927b48..9fa6a60fdab22e422cd5d54caf2c2ec26ef1ad61 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -100,6 +100,18 @@ struct page {
         */
        void *shadow;
 #endif
+
+#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
+       /*
+        * Used to implement support for notification on zero-copy TCP transfer
+        * completion. It might look as not good to have this field here and
+        * it's better to have it in struct sk_buff, but it would make the code
+        * much more complicated and fragile, since all skb then would have to
+        * contain only pages with the same value in this field.
+        */
+        void *net_priv;
+#endif
+
 };
 
 /*
@@ -299,7 +311,7 @@ struct mm_struct {
         * new_owner->mm == mm
         * new_owner->alloc_lock is held
         */
-       struct task_struct *owner;
+       struct task_struct __rcu *owner;
 #endif
 
 #ifdef CONFIG_PROC_FS
@@ -310,6 +322,8 @@ struct mm_struct {
 #ifdef CONFIG_MMU_NOTIFIER
        struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
+       /* How many tasks sharing this mm are OOM_DISABLE */
+       atomic_t oom_disable_count;
 };
 
 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */