From f196a66d2e427f244a0931033bb67e1ed4f61f5f Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:38 +0100
Subject: [PATCH] --- yaml --- r: 80042 b: refs/heads/master c:
 fc87e9061a5635fe1b367dad95498846dd5eda31 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/include/asm-x86/mmsegment.h      | 8 --------
 trunk/include/asm-x86/processor.h      | 5 +++++
 trunk/include/asm-x86/processor_32.h   | 5 -----
 trunk/include/asm-x86/processor_64.h   | 1 -
 trunk/include/asm-x86/thread_info_64.h | 2 +-
 6 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/include/asm-x86/mmsegment.h

diff --git a/[refs] b/[refs]
index 8815cd180a0b..c15fd2041502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c1c468a382e64afccacdfe03fa4c0615cd4264f
+refs/heads/master: fc87e9061a5635fe1b367dad95498846dd5eda31
diff --git a/trunk/include/asm-x86/mmsegment.h b/trunk/include/asm-x86/mmsegment.h
deleted file mode 100644
index d3f80c996330..000000000000
--- a/trunk/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/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index 2b896b0aa3fa..87466b6d3b92 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/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/trunk/include/asm-x86/processor_32.h b/trunk/include/asm-x86/processor_32.h
index f0f7ca48444e..fa921aa1a93f 100644
--- a/trunk/include/asm-x86/processor_32.h
+++ b/trunk/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/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h
index bfc4ce6e2f00..1a258749b7ca 100644
--- a/trunk/include/asm-x86/processor_64.h
+++ b/trunk/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/trunk/include/asm-x86/thread_info_64.h b/trunk/include/asm-x86/thread_info_64.h
index c2911a99cc32..9b531ea015a8 100644
--- a/trunk/include/asm-x86/thread_info_64.h
+++ b/trunk/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 */