Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[linux-2.6] / include / asm-x86 / mmu_64.h

diff --git a/include/asm-x86/mmu_64.h b/include/asm-x86/mmu_64.h
index d2cd4a9d984d1011c66d94c26a66b6063daaeab9..024357c2722293af18e5f450a7815e31fe3b320f 100644 (file)
--- a/include/asm-x86/mmu_64.h
+++ b/include/asm-x86/mmu_64.h
@@ -2,7 +2,7 @@
 #define __x86_64_MMU_H
 
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 /*
  * The x86_64 doesn't have a mmu context, but
@@ -14,7 +14,7 @@ typedef struct {
        void *ldt;
        rwlock_t ldtlock; 
        int size;
-       struct semaphore sem; 
+       struct mutex lock;
        void *vdso;
 } mm_context_t;