diff --git a/[refs] b/[refs] index 5e0c4c90d604..bec4b0f50b76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f073cc8f39b48fdf4c8cd9520a6028fe69199b60 +refs/heads/master: af6a25f0e1ec0265c267e6ee4513925eaba6d0ed diff --git a/trunk/arch/x86/include/asm/mmu.h b/trunk/arch/x86/include/asm/mmu.h index aeff3e89b222..5f55e6962769 100644 --- a/trunk/arch/x86/include/asm/mmu.h +++ b/trunk/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