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@xxxxxxxxxx> --- include/asm-x86/mmsegment.h | 8 -------- include/asm-x86/processor.h | 5 +++++ include/asm-x86/processor_32.h | 5 ----- include/asm-x86/processor_64.h | 1 - include/asm-x86/thread_info_64.h | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-) Index: linux-2.6-x86/include/asm-x86/mmsegment.h =================================================================== --- linux-2.6-x86.orig/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 Index: linux-2.6-x86/include/asm-x86/processor.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/processor.h +++ linux-2.6-x86/include/asm-x86/processor.h @@ -420,6 +420,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 */ Index: linux-2.6-x86/include/asm-x86/processor_32.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/processor_32.h +++ linux-2.6-x86/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, \ Index: linux-2.6-x86/include/asm-x86/processor_64.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/processor_64.h +++ linux-2.6-x86/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> Index: linux-2.6-x86/include/asm-x86/thread_info_64.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/thread_info_64.h +++ linux-2.6-x86/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 */ _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization