fix up ext2_fs.h for userspace after reservations backport

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

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 145b3d053048b1527f47cdbabde5eeb26cc3a15d..f4c03e0b355e04dbbbc05f9500350d632ef87bd6 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -1,7 +1,7 @@
 #ifndef _LINUX_MM_TYPES_H
 #define _LINUX_MM_TYPES_H
 
-#include <linux/auxvec.h>      /* For AT_VECTOR_SIZE */
+#include <linux/auxvec.h>
 #include <linux/types.h>
 #include <linux/threads.h>
 #include <linux/list.h>
@@ -13,6 +13,11 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 
+#ifndef AT_VECTOR_SIZE_ARCH
+#define AT_VECTOR_SIZE_ARCH 0
+#endif
+#define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
+
 struct address_space;
 
 #if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
@@ -37,10 +42,7 @@ struct page {
                                         * to show when page is mapped
                                         * & limit reverse map searches.
                                         */
-               struct {        /* SLUB uses */
-                       short unsigned int inuse;
-                       short unsigned int offset;
-               };
+               unsigned int inuse;     /* SLUB: Nr of objects */
        };
        union {
            struct {
@@ -62,13 +64,8 @@ struct page {
 #if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
            spinlock_t ptl;
 #endif
-           struct {                    /* SLUB uses */
-               void **lockless_freelist;
-               struct kmem_cache *slab;        /* Pointer to slab */
-           };
-           struct {
-               struct page *first_page;        /* Compound pages */
-           };
+           struct kmem_cache *slab;    /* SLUB: Pointer to slab */
+           struct page *first_page;    /* Compound tail pages */
        };
        union {
                pgoff_t index;          /* Our offset within mapping. */