Merge branches 'slab/next' and 'slub/partial' into slab/for-linus

[pandora-kernel.git] / include / linux / mm_types.h

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 774b895..c93d00a 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -79,9 +79,21 @@ struct page {
        };
 
        /* Third double word block */
-       struct list_head lru;           /* Pageout list, eg. active_list
+       union {
+               struct list_head lru;   /* Pageout list, eg. active_list
                                         * protected by zone->lru_lock !
                                         */
+               struct {                /* slub per cpu partial pages */
+                       struct page *next;      /* Next partial slab */
+#ifdef CONFIG_64BIT
+                       int pages;      /* Nr of partial slabs left */
+                       int pobjects;   /* Approximate # of objects */
+#else
+                       short int pages;
+                       short int pobjects;
+#endif
+               };
+       };
 
        /* Remainder is not double word aligned */
        union {
@@ -135,6 +147,17 @@ struct page {
 #endif
 ;
 
+struct page_frag {
+       struct page *page;
+#if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536)
+       __u32 offset;
+       __u32 size;
+#else
+       __u16 offset;
+       __u16 size;
+#endif
+};
+
 typedef unsigned long __nocast vm_flags_t;
 
 /*