Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[linux-2.6-omap-h63xx.git] / include / linux / mm_types.h

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index e30687bad07590c11acf6c43debb041d5db89316..d5bb1796e12b19a1dde4960c2f10d0064a8867b9 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -50,13 +50,16 @@ struct page {
            spinlock_t ptl;
 #endif
            struct {                    /* SLUB uses */
-               struct page *first_page;        /* Compound pages */
+               void **lockless_freelist;
                struct kmem_cache *slab;        /* Pointer to slab */
            };
+           struct {
+               struct page *first_page;        /* Compound pages */
+           };
        };
        union {
                pgoff_t index;          /* Our offset within mapping. */
-               void *freelist;         /* SLUB: pointer to free object */
+               void *freelist;         /* SLUB: freelist req. slab lock */
        };
        struct list_head lru;           /* Pageout list, eg. active_list
                                         * protected by zone->lru_lock !