diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 07:31:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:14 -0500 |
commit | c81c6ca45a69478c7877b729af1942d2b80ef582 (patch) | |
tree | e26aeaa7ace08ce222bd4cb28add95d18dbd4bbd /include | |
parent | 507f90c9f92592e7630b1c1e87bf92d2c9858cc6 (diff) |
x86: unify set_tss_desc
This patch unifies the set_tss_desc between i386 and x86_64,
which can now have a common implementation. After the old
functions are removed from desc_{32,64}.h, nothing important is
left, and the files can be removed.
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/desc.h | 39 | ||||
-rw-r--r-- | include/asm-x86/desc_32.h | 27 | ||||
-rw-r--r-- | include/asm-x86/desc_64.h | 33 |
3 files changed, 33 insertions, 66 deletions
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h index d75bc063431..c31715cf221 100644 --- a/include/asm-x86/desc.h +++ b/include/asm-x86/desc.h | |||
@@ -165,6 +165,39 @@ static inline void pack_ldt(ldt_desc *ldt, unsigned long addr, | |||
165 | #endif | 165 | #endif |
166 | } | 166 | } |
167 | 167 | ||
168 | static inline void pack_tss(tss_desc *tss, unsigned long addr, | ||
169 | unsigned size, unsigned entry) | ||
170 | { | ||
171 | #ifdef CONFIG_X86_64 | ||
172 | set_tssldt_descriptor(tss, | ||
173 | addr, entry, size); | ||
174 | #else | ||
175 | pack_descriptor(tss, (unsigned long)addr, | ||
176 | size, | ||
177 | 0x80 | entry, 0); | ||
178 | #endif | ||
179 | } | ||
180 | |||
181 | static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr) | ||
182 | { | ||
183 | struct desc_struct *d = get_cpu_gdt_table(cpu); | ||
184 | tss_desc tss; | ||
185 | |||
186 | /* | ||
187 | * sizeof(unsigned long) coming from an extra "long" at the end | ||
188 | * of the iobitmap. See tss_struct definition in processor.h | ||
189 | * | ||
190 | * -1? seg base+limit should be pointing to the address of the | ||
191 | * last valid byte | ||
192 | */ | ||
193 | pack_tss(&tss, (unsigned long)addr, | ||
194 | IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1, | ||
195 | DESC_TSS); | ||
196 | write_gdt_entry(d, entry, &tss, DESC_TSS); | ||
197 | } | ||
198 | |||
199 | #define set_tss_desc(cpu, addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr) | ||
200 | |||
168 | static inline void native_set_ldt(const void *addr, unsigned int entries) | 201 | static inline void native_set_ldt(const void *addr, unsigned int entries) |
169 | { | 202 | { |
170 | if (likely(entries == 0)) | 203 | if (likely(entries == 0)) |
@@ -222,12 +255,6 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) | |||
222 | gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; | 255 | gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; |
223 | } | 256 | } |
224 | 257 | ||
225 | #ifdef CONFIG_X86_32 | ||
226 | # include "desc_32.h" | ||
227 | #else | ||
228 | # include "desc_64.h" | ||
229 | #endif | ||
230 | |||
231 | #define _LDT_empty(info) (\ | 258 | #define _LDT_empty(info) (\ |
232 | (info)->base_addr == 0 && \ | 259 | (info)->base_addr == 0 && \ |
233 | (info)->limit == 0 && \ | 260 | (info)->limit == 0 && \ |
diff --git a/include/asm-x86/desc_32.h b/include/asm-x86/desc_32.h deleted file mode 100644 index 3b112ec186a..00000000000 --- a/include/asm-x86/desc_32.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | #ifndef __ARCH_DESC_H | ||
2 | #define __ARCH_DESC_H | ||
3 | |||
4 | #include <asm/ldt.h> | ||
5 | #include <asm/segment.h> | ||
6 | #include <asm/desc_defs.h> | ||
7 | |||
8 | #ifndef __ASSEMBLY__ | ||
9 | |||
10 | #include <linux/preempt.h> | ||
11 | #include <linux/percpu.h> | ||
12 | |||
13 | static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, const void *addr) | ||
14 | { | ||
15 | tss_desc tss; | ||
16 | pack_descriptor(&tss, (unsigned long)addr, | ||
17 | offsetof(struct tss_struct, __cacheline_filler) - 1, | ||
18 | DESC_TSS, 0); | ||
19 | write_gdt_entry(get_cpu_gdt_table(cpu), entry, &tss, DESC_TSS); | ||
20 | } | ||
21 | |||
22 | |||
23 | #define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr) | ||
24 | |||
25 | #endif /* !__ASSEMBLY__ */ | ||
26 | |||
27 | #endif | ||
diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h index 6bc92e6e5cc..8b137891791 100644 --- a/include/asm-x86/desc_64.h +++ b/include/asm-x86/desc_64.h | |||
@@ -1,34 +1 @@ | |||
1 | /* Written 2000 by Andi Kleen */ | ||
2 | #ifndef __ARCH_DESC_H | ||
3 | #define __ARCH_DESC_H | ||
4 | |||
5 | #include <linux/threads.h> | ||
6 | #include <asm/ldt.h> | ||
7 | |||
8 | #ifndef __ASSEMBLY__ | ||
9 | |||
10 | #include <linux/string.h> | ||
11 | |||
12 | #include <asm/segment.h> | ||
13 | |||
14 | static inline void set_tss_desc(unsigned cpu, void *addr) | ||
15 | { | ||
16 | struct desc_struct *d = get_cpu_gdt_table(cpu); | ||
17 | tss_desc tss; | ||
18 | |||
19 | /* | ||
20 | * sizeof(unsigned long) coming from an extra "long" at the end | ||
21 | * of the iobitmap. See tss_struct definition in processor.h | ||
22 | * | ||
23 | * -1? seg base+limit should be pointing to the address of the | ||
24 | * last valid byte | ||
25 | */ | ||
26 | set_tssldt_descriptor(&tss, | ||
27 | (unsigned long)addr, DESC_TSS, | ||
28 | IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1); | ||
29 | write_gdt_entry(d, GDT_ENTRY_TSS, &tss, DESC_TSS); | ||
30 | } | ||
31 | |||
32 | #endif /* !__ASSEMBLY__ */ | ||
33 | |||
34 | #endif | ||