Merge commit 'v3.1-rc2' into HEAD

[karo-tx-linux.git] / arch / x86 / include / asm / mmu.h

diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
index aeff3e89b222edc08d31f122dc7008a0cc8466a9..5f55e69627692f9a353355bbb426ef8bf73fc44c 100644 (file)
--- a/arch/x86/include/asm/mmu.h
+++ b/arch/x86/include/asm/mmu.h
@@ -11,14 +11,14 @@
 typedef struct {
        void *ldt;
        int size;
-       struct mutex lock;
-       void *vdso;
 
 #ifdef CONFIG_X86_64
        /* True if mm supports a task running in 32 bit compatibility mode. */
        unsigned short ia32_compat;
 #endif
 
+       struct mutex lock;
+       void *vdso;
 } mm_context_t;
 
 #ifdef CONFIG_SMP