1 files changed, 0 insertions, 122 deletions
diff --git a/include/asm-x86/segment_32.h b/include/asm-x86/segment_32.h
index 3e133ad4252d..8b137891791f 100644
--- a/include/asm-x86/segment_32.h
+++ b/include/asm-x86/segment_32.h
@@ -1,123 +1 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-/*
- * The layout of the per-CPU GDT under Linux:
- *
- *   0 - null
- *   1 - reserved
- *   2 - reserved
- *   3 - reserved
- *
- *   4 - unused                 <==== new cacheline
- *   5 - unused
- *
- *  ------- start of TLS (Thread-Local Storage) segments:
- *
- *   6 - TLS segment #1                 [ glibc's TLS segment ]
- *   7 - TLS segment #2                 [ Wine's %fs Win32 segment ]
- *   8 - TLS segment #3
- *   9 - reserved
- *  10 - reserved
- *  11 - reserved
- *
- *  ------- start of kernel segments:
- *
- *  12 - kernel code segment            <==== new cacheline
- *  13 - kernel data segment
- *  14 - default user CS
- *  15 - default user DS
- *  16 - TSS
- *  17 - LDT
- *  18 - PNPBIOS support (16->32 gate)
- *  19 - PNPBIOS support
- *  20 - PNPBIOS support
- *  21 - PNPBIOS support
- *  22 - PNPBIOS support
- *  23 - APM BIOS support
- *  24 - APM BIOS support
- *  25 - APM BIOS support 
- *
- *  26 - ESPFIX small SS
- *  27 - per-cpu                        [ offset to per-cpu data area ]
- *  28 - unused
- *  29 - unused
- *  30 - unused
- *  31 - TSS for double fault handler
- */
-#define GDT_ENTRY_TLS_MIN       6
-#define GDT_ENTRY_TLS_MAX       (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
-#define GDT_ENTRY_DEFAULT_USER_CS       14
-#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS * 8 + 3)
-#define GDT_ENTRY_DEFAULT_USER_DS       15
-#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS * 8 + 3)
-#define GDT_ENTRY_KERNEL_BASE   12
-#define GDT_ENTRY_KERNEL_CS             (GDT_ENTRY_KERNEL_BASE + 0)
-#define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
-#define GDT_ENTRY_KERNEL_DS             (GDT_ENTRY_KERNEL_BASE + 1)
-#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
-#define GDT_ENTRY_TSS                   (GDT_ENTRY_KERNEL_BASE + 4)
-#define GDT_ENTRY_LDT                   (GDT_ENTRY_KERNEL_BASE + 5)
-#define GDT_ENTRY_PNPBIOS_BASE          (GDT_ENTRY_KERNEL_BASE + 6)
-#define GDT_ENTRY_APMBIOS_BASE          (GDT_ENTRY_KERNEL_BASE + 11)
-#define GDT_ENTRY_ESPFIX_SS             (GDT_ENTRY_KERNEL_BASE + 14)
-#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
-#define GDT_ENTRY_PERCPU                        (GDT_ENTRY_KERNEL_BASE + 15)
-#ifdef CONFIG_SMP
-#define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
-#else
-#define __KERNEL_PERCPU 0
-#endif
-#define GDT_ENTRY_DOUBLEFAULT_TSS       31
-/*
- * The GDT has 32 entries
- */
-#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)
-#define GDT_ENTRY_PNPBIOS_DS            (GDT_ENTRY_PNPBIOS_BASE + 2)
-#define GDT_ENTRY_PNPBIOS_TS1           (GDT_ENTRY_PNPBIOS_BASE + 3)
-#define GDT_ENTRY_PNPBIOS_TS2           (GDT_ENTRY_PNPBIOS_BASE + 4)
-/* The PnP BIOS selectors */
-#define PNP_CS32   (GDT_ENTRY_PNPBIOS_CS32 * 8) /* segment for calling fn */
-#define PNP_CS16   (GDT_ENTRY_PNPBIOS_CS16 * 8) /* code segment for BIOS */
-#define PNP_DS     (GDT_ENTRY_PNPBIOS_DS * 8)   /* data segment for BIOS */
-#define PNP_TS1    (GDT_ENTRY_PNPBIOS_TS1 * 8)  /* transfer data segment */
-#define PNP_TS2    (GDT_ENTRY_PNPBIOS_TS2 * 8)  /* another data segment */
-/*
- * Matching rules for certain types of segments.
- */
-/* Matches only __KERNEL_CS, ignoring PnP / USER / APM segments */
-#define SEGMENT_IS_KERNEL_CODE(x) (((x) & 0xfc) == GDT_ENTRY_KERNEL_CS * 8)
-/* Matches __KERNEL_CS and __USER_CS (they must be 2 entries apart) */
-#define SEGMENT_IS_FLAT_CODE(x)  (((x) & 0xec) == GDT_ENTRY_KERNEL_CS * 8)
-/* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
-#define SEGMENT_IS_PNP_CODE(x)   (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
-#endif

diff --git a/include/asm-x86/segment_32.h b/include/asm-x86/segment_32.h index 3e133ad4252d..8b137891791f 100644 --- a/include/asm-x86/segment_32.h +++ b/include/asm-x86/segment_32.h
@@ -1,123 +1 @@
1	#ifndef _ASM_SEGMENT_H
2	#define _ASM_SEGMENT_H
3
4	/*
5	* The layout of the per-CPU GDT under Linux:
6	*
7	* 0 - null
8	* 1 - reserved
9	* 2 - reserved
10	* 3 - reserved
11	*
12	* 4 - unused <==== new cacheline
13	* 5 - unused
14	*
15	* ------- start of TLS (Thread-Local Storage) segments:
16	*
17	* 6 - TLS segment #1 [ glibc's TLS segment ]
18	* 7 - TLS segment #2 [ Wine's %fs Win32 segment ]
19	* 8 - TLS segment #3
20	* 9 - reserved
21	* 10 - reserved
22	* 11 - reserved
23	*
24	* ------- start of kernel segments:
25	*
26	* 12 - kernel code segment <==== new cacheline
27	* 13 - kernel data segment
28	* 14 - default user CS
29	* 15 - default user DS
30	* 16 - TSS
31	* 17 - LDT
32	* 18 - PNPBIOS support (16->32 gate)
33	* 19 - PNPBIOS support
34	* 20 - PNPBIOS support
35	* 21 - PNPBIOS support
36	* 22 - PNPBIOS support
37	* 23 - APM BIOS support
38	* 24 - APM BIOS support
39	* 25 - APM BIOS support
40	*
41	* 26 - ESPFIX small SS
42	* 27 - per-cpu [ offset to per-cpu data area ]
43	* 28 - unused
44	* 29 - unused
45	* 30 - unused
46	* 31 - TSS for double fault handler
47	*/
48	#define GDT_ENTRY_TLS_MIN 6
49	#define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
50
51	#define GDT_ENTRY_DEFAULT_USER_CS 14
52	#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS * 8 + 3)
53
54	#define GDT_ENTRY_DEFAULT_USER_DS 15
55	#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS * 8 + 3)
56
57	#define GDT_ENTRY_KERNEL_BASE 12
58
59	#define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0)
60	#define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
61
62	#define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1)
63	#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
64
65	#define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4)
66	#define GDT_ENTRY_LDT (GDT_ENTRY_KERNEL_BASE + 5)
67
68	#define GDT_ENTRY_PNPBIOS_BASE (GDT_ENTRY_KERNEL_BASE + 6)
69	#define GDT_ENTRY_APMBIOS_BASE (GDT_ENTRY_KERNEL_BASE + 11)
70
71	#define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
72	#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
73
74	#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
75	#ifdef CONFIG_SMP
76	#define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
77	#else
78	#define __KERNEL_PERCPU 0
79	#endif
80
81	#define GDT_ENTRY_DOUBLEFAULT_TSS 31
82
83	/*
84	* The GDT has 32 entries
85	*/
86	#define GDT_ENTRIES 32
87
88	/* Simple and small GDT entries for booting only */
89
90	#define GDT_ENTRY_BOOT_CS 2
91	#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8)
92
93	#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1)
94	#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8)
95
96	/* The PnP BIOS entries in the GDT */
97	#define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0)
98	#define GDT_ENTRY_PNPBIOS_CS16 (GDT_ENTRY_PNPBIOS_BASE + 1)
99	#define GDT_ENTRY_PNPBIOS_DS (GDT_ENTRY_PNPBIOS_BASE + 2)
100	#define GDT_ENTRY_PNPBIOS_TS1 (GDT_ENTRY_PNPBIOS_BASE + 3)
101	#define GDT_ENTRY_PNPBIOS_TS2 (GDT_ENTRY_PNPBIOS_BASE + 4)
102
103	/* The PnP BIOS selectors */
104	#define PNP_CS32 (GDT_ENTRY_PNPBIOS_CS32 * 8) /* segment for calling fn */
105	#define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16 * 8) /* code segment for BIOS */
106	#define PNP_DS (GDT_ENTRY_PNPBIOS_DS * 8) /* data segment for BIOS */
107	#define PNP_TS1 (GDT_ENTRY_PNPBIOS_TS1 * 8) /* transfer data segment */
108	#define PNP_TS2 (GDT_ENTRY_PNPBIOS_TS2 * 8) /* another data segment */
109
110	/*
111	* Matching rules for certain types of segments.
112	*/
113
114	/* Matches only __KERNEL_CS, ignoring PnP / USER / APM segments */
115	#define SEGMENT_IS_KERNEL_CODE(x) (((x) & 0xfc) == GDT_ENTRY_KERNEL_CS * 8)
116
117	/* Matches __KERNEL_CS and __USER_CS (they must be 2 entries apart) */
118	#define SEGMENT_IS_FLAT_CODE(x) (((x) & 0xec) == GDT_ENTRY_KERNEL_CS * 8)
119
120	/* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
121	#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
122
123	#endif