2007-10-20 06:57:18

by Chris Snook

Subject: [PATCH] x86: merge mmu{,_32,_64}.h

From: Chris Snook <[email protected]>

Merge mmu_32.h and mmu_64.h into mmu.h.

Signed-off-by: Chris Snook <[email protected]>

diff -Nurp a/include/asm-x86/mmu_32.h b/include/asm-x86/mmu_32.h
--- a/include/asm-x86/mmu_32.h 2007-10-20 02:42:24.000000000 -0400
+++ b/include/asm-x86/mmu_32.h 1969-12-31 19:00:00.000000000 -0500
@@ -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 -Nurp a/include/asm-x86/mmu_64.h b/include/asm-x86/mmu_64.h
--- a/include/asm-x86/mmu_64.h 2007-10-20 02:42:24.000000000 -0400
+++ b/include/asm-x86/mmu_64.h 1969-12-31 19:00:00.000000000 -0500
@@ -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
diff -Nurp a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
--- a/include/asm-x86/mmu.h 2007-10-20 02:42:24.000000000 -0400
+++ b/include/asm-x86/mmu.h 2007-10-20 02:38:36.000000000 -0400
@@ -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 */

2007-10-20 10:50:55

by Thomas Gleixner

Subject: Re: [PATCH] x86: merge mmu{,_32,_64}.h

On Sat, 20 Oct 2007, Chris Snook wrote:

> From: Chris Snook <[email protected]>
>
> Merge mmu_32.h and mmu_64.h into mmu.h.
>
> Signed-off-by: Chris Snook <[email protected]>

Applied. Thanks,

tglx