From 26103efc27f4414e346866a390eafacb828b2452 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 30 Jan 2008 13:33:01 +0100
Subject: [PATCH] --- yaml --- r: 80239 b: refs/heads/master c:
 2a6648e65a2939b80c44262975176a15bac3a75e h: refs/heads/master i:   80237:
 b5d7ecb46f61f19a8e407e7edc8850ac0832b163   80235:
 868d3fa1b6fe4c2d77f90e897e0ff1cddb2a876f   80231:
 7e02822b292082eb9e75e9c9f9deedc4f0cf3407   80223:
 58fd5a0d78ceaef5148d8c1b0600dacf68d64f43 v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-x86/segment.h    | 24 ++++++++----------------
 trunk/include/asm-x86/segment_32.h |  1 -
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 trunk/include/asm-x86/segment_32.h

diff --git a/[refs] b/[refs]
index a2195e51022d..a071f691cc27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1017579a8c6ad6f32154e41ddfdf96d1efbb21b4
+refs/heads/master: 2a6648e65a2939b80c44262975176a15bac3a75e
diff --git a/trunk/include/asm-x86/segment.h b/trunk/include/asm-x86/segment.h
index c7509df79141..1ff05a9f5513 100644
--- a/trunk/include/asm-x86/segment.h
+++ b/trunk/include/asm-x86/segment.h
@@ -1,6 +1,14 @@
 #ifndef _ASM_X86_SEGMENT_H_
 #define _ASM_X86_SEGMENT_H_
 
+/* Simple and small GDT entries for booting only */
+
+#define GDT_ENTRY_BOOT_CS	2
+#define __BOOT_CS		(GDT_ENTRY_BOOT_CS * 8)
+
+#define GDT_ENTRY_BOOT_DS	(GDT_ENTRY_BOOT_CS + 1)
+#define __BOOT_DS		(GDT_ENTRY_BOOT_DS * 8)
+
 #ifdef CONFIG_X86_32
 /*
  * The layout of the per-CPU GDT under Linux:
@@ -86,14 +94,6 @@
  */
 #define GDT_ENTRIES 32
 
-/* Simple and small GDT entries for booting only */
-
-#define GDT_ENTRY_BOOT_CS		2
-#define __BOOT_CS	(GDT_ENTRY_BOOT_CS * 8)
-
-#define GDT_ENTRY_BOOT_DS		(GDT_ENTRY_BOOT_CS + 1)
-#define __BOOT_DS	(GDT_ENTRY_BOOT_DS * 8)
-
 /* The PnP BIOS entries in the GDT */
 #define GDT_ENTRY_PNPBIOS_CS32		(GDT_ENTRY_PNPBIOS_BASE + 0)
 #define GDT_ENTRY_PNPBIOS_CS16		(GDT_ENTRY_PNPBIOS_BASE + 1)
@@ -136,14 +136,6 @@
 #else
 #include <asm/cache.h>
 
-/* Simple and small GDT entries for booting only */
-
-#define GDT_ENTRY_BOOT_CS		2
-#define __BOOT_CS	(GDT_ENTRY_BOOT_CS * 8)
-
-#define GDT_ENTRY_BOOT_DS		(GDT_ENTRY_BOOT_CS + 1)
-#define __BOOT_DS	(GDT_ENTRY_BOOT_DS * 8)
-
 #define __KERNEL_CS	0x10
 #define __KERNEL_DS	0x18
 
diff --git a/trunk/include/asm-x86/segment_32.h b/trunk/include/asm-x86/segment_32.h
deleted file mode 100644
index 8b137891791f..000000000000
--- a/trunk/include/asm-x86/segment_32.h
+++ /dev/null
@@ -1 +0,0 @@
-