diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 13:31:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:38 +0100 |
| commit | fc87e9061a5635fe1b367dad95498846dd5eda31 (patch) | |
| tree | 6b10d1714359b22c9c28e85627888552d644833b | |
| parent | 2c1c468a382e64afccacdfe03fa4c0615cd4264f (diff) | |
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>
| -rw-r--r-- | include/asm-x86/mmsegment.h | 8 | ||||
| -rw-r--r-- | include/asm-x86/processor.h | 5 | ||||
| -rw-r--r-- | include/asm-x86/processor_32.h | 5 | ||||
| -rw-r--r-- | include/asm-x86/processor_64.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/thread_info_64.h | 2 |
5 files changed, 6 insertions, 15 deletions
diff --git a/include/asm-x86/mmsegment.h b/include/asm-x86/mmsegment.h deleted file mode 100644 index d3f80c99633..00000000000 --- 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 2b896b0aa3f..87466b6d3b9 100644 --- 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 f0f7ca48444..fa921aa1a93 100644 --- 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 bfc4ce6e2f0..1a258749b7c 100644 --- 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 c2911a99cc3..9b531ea015a 100644 --- 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 */ |