x86: unify mm_segment_t definition

This patch moves the mm_segment_t structure definition to processor.h
This makes mmsegment.h file useless, and it is deleted.

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/mmsegment.h b/include/asm-x86/mmsegment.h
deleted file mode 100644 (file)
index d3f80c9..0000000
--- a/include/asm-x86/mmsegment.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_MMSEGMENT_H
-#define _ASM_MMSEGMENT_H 1
-
-typedef struct {
-       unsigned long seg;
-} mm_segment_t;
-
-#endif

diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 2b896b0aa3fa95483c633bc9b960469787851050..87466b6d3b9297d828eb22df9bd6870d744ce2d7 100644 (file)
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -424,6 +424,11 @@ struct extended_sigtable {
        struct extended_signature sigs[0];
 };
 
+typedef struct {
+       unsigned long seg;
+} mm_segment_t;
+
+
 /*
  * create a kernel thread without removing it from tasklists
  */

diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index f0f7ca48444e406fb37b02ea30d936548d52ae1a..fa921aa1a93f64300b1b0a97825f2a3629b8375a 100644 (file)
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -103,11 +103,6 @@ union i387_union {
        struct i387_soft_struct soft;
 };
 
-typedef struct {
-       unsigned long seg;
-} mm_segment_t;
-
-
 #define INIT_THREAD  {                                                 \
        .sp0 = sizeof(init_stack) + (long)&init_stack,                  \
        .vm86_info = NULL,                                              \

diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index bfc4ce6e2f006a4b3197ec5e245c2c56cf9bdae7..1a258749b7cab3a8a1201f6d26fef68ff5f26037 100644 (file)
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -14,7 +14,6 @@
 #include <asm/msr.h>
 #include <asm/current.h>
 #include <asm/system.h>
-#include <asm/mmsegment.h>
 #include <linux/personality.h>
 #include <asm/desc_defs.h>
 

diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h
index c2911a99cc3288fb1ed6a037af87af23b42de3ca..9b531ea015a83a491ed810acaaed074c6069a76b 100644 (file)
--- a/include/asm-x86/thread_info_64.h
+++ b/include/asm-x86/thread_info_64.h
@@ -21,7 +21,7 @@
 #ifndef __ASSEMBLY__
 struct task_struct;
 struct exec_domain;
-#include <asm/mmsegment.h>
+#include <asm/processor.h>
 
 struct thread_info {
        struct task_struct      *task;          /* main task structure */