diff --git a/[refs] b/[refs]
index df94cd9a2370..739f5d8e5af2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b746278da8d6642bc487ec35efe4be2333f03f
+refs/heads/master: afe73824f52d6767c77e9456f573a76075108279
diff --git a/trunk/include/asm-x86/mmu.h b/trunk/include/asm-x86/mmu.h
index 00e88679e11f..80a1dee5bea5 100644
--- a/trunk/include/asm-x86/mmu.h
+++ b/trunk/include/asm-x86/mmu.h
@@ -7,14 +7,9 @@
 /*
  * The x86 doesn't have a mmu context, but
  * we put the segment information here.
- *
- * cpu_vm_mask is used to optimize ldt flushing.
  */
 typedef struct {
 	void *ldt;
-#ifdef CONFIG_X86_64
-	rwlock_t ldtlock;
-#endif
 	int size;
 	struct mutex lock;
 	void *vdso;