Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / mmu-fsl-booke.h

diff --git a/arch/powerpc/include/asm/mmu-fsl-booke.h b/arch/powerpc/include/asm/mmu-fsl-booke.h
index 925d93cf64d8596f5b376a6b7740cc7193b25a95..3f941c0f7e8eb504dd921e2a89b3f93087fb66ca 100644 (file)
--- a/arch/powerpc/include/asm/mmu-fsl-booke.h
+++ b/arch/powerpc/include/asm/mmu-fsl-booke.h
@@ -40,6 +40,8 @@
 #define MAS2_M         0x00000004
 #define MAS2_G         0x00000002
 #define MAS2_E         0x00000001
+#define MAS2_EPN_MASK(size)            (~0 << (2*(size) + 10))
+#define MAS2_VAL(addr, size, flags)    ((addr) & MAS2_EPN_MASK(size) | (flags))
 
 #define MAS3_RPN       0xFFFFF000
 #define MAS3_U0                0x00000200
@@ -74,8 +76,9 @@
 #ifndef __ASSEMBLY__
 
 typedef struct {
-       unsigned long id;
-       unsigned long vdso_base;
+       unsigned int    id;
+       unsigned int    active;
+       unsigned long   vdso_base;
 } mm_context_t;
 #endif /* !__ASSEMBLY__ */