Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / mmu-40x.h

diff --git a/arch/powerpc/include/asm/mmu-40x.h b/arch/powerpc/include/asm/mmu-40x.h
index 3d108676584c8ef6cf0c4ac7e3cb813939a358a8..776f415a36aa36da64c4d78084514730a16d2c61 100644 (file)
--- a/arch/powerpc/include/asm/mmu-40x.h
+++ b/arch/powerpc/include/asm/mmu-40x.h
@@ -54,8 +54,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__ */