Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=703530238b580d69d4a112d3ab3d58c0eb1e7246
Commit:     703530238b580d69d4a112d3ab3d58c0eb1e7246
Parent:     4d022adab4511892226f1eae00a44502bf685ae5
Author:     Chris Snook <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 20 02:56:59 2007 -0400
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Tue Oct 23 22:37:22 2007 +0200

    x86: merge mmu{,_32,_64}.h
    
    Merge mmu_32.h and mmu_64.h into mmu.h.
    
    Signed-off-by: Chris Snook <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 include/asm-x86/mmu.h    |   26 ++++++++++++++++++++++----
 include/asm-x86/mmu_32.h |   18 ------------------
 include/asm-x86/mmu_64.h |   21 ---------------------
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
index 9c628cd..3f922c8 100644
--- a/include/asm-x86/mmu.h
+++ b/include/asm-x86/mmu.h
@@ -1,5 +1,23 @@
-#ifdef CONFIG_X86_32
-# include "mmu_32.h"
-#else
-# include "mmu_64.h"
+#ifndef _ASM_X86_MMU_H
+#define _ASM_X86_MMU_H
+
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+
+/*
+ * 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;
+} mm_context_t;
+
+#endif /* _ASM_X86_MMU_H */
diff --git a/include/asm-x86/mmu_32.h b/include/asm-x86/mmu_32.h
deleted file mode 100644
index 5e249c5..0000000
--- a/include/asm-x86/mmu_32.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __i386_MMU_H
-#define __i386_MMU_H
-
-#include <linux/mutex.h>
-/*
- * The i386 doesn't have a mmu context, but
- * we put the segment information here.
- *
- * cpu_vm_mask is used to optimize ldt flushing.
- */
-typedef struct { 
-       int size;
-       struct mutex lock;
-       void *ldt;
-       void *vdso;
-} mm_context_t;
-
-#endif
diff --git a/include/asm-x86/mmu_64.h b/include/asm-x86/mmu_64.h
deleted file mode 100644
index 024357c..0000000
--- a/include/asm-x86/mmu_64.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __x86_64_MMU_H
-#define __x86_64_MMU_H
-
-#include <linux/spinlock.h>
-#include <linux/mutex.h>
-
-/*
- * The x86_64 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;
-       rwlock_t ldtlock; 
-       int size;
-       struct mutex lock;
-       void *vdso;
-} mm_context_t;
-
-#endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to