[XFS] Fix merge failures

[pandora-kernel.git] / arch / s390 / include / asm / mmu.h

diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index 5dd5e7b..3b59216 100644 (file)
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -6,8 +6,10 @@ typedef struct {
        struct list_head pgtable_list;
        unsigned long asce_bits;
        unsigned long asce_limit;
+       unsigned long vdso_base;
        int noexec;
-       int pgstes;
+       int has_pgste;   /* The mmu context has extended page tables */
+       int alloc_pgste; /* cloned contexts will have extended page tables */
 } mm_context_t;
 
 #endif